Merge branch 'master' of metalzone:etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Sat, 26 Dec 2009 11:26:37 +0000 (11:26 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 26 Dec 2009 11:26:37 +0000 (11:26 +0000)
* 'master' of metalzone:etc/profile:
  dot/emacs, el/dot-emacs.el: Fix patterns for root prompt.

1  2 
dot/emacs
el/dot-emacs.el

diff --cc dot/emacs
Simple merge
diff --cc el/dot-emacs.el
Simple merge