chiark / gitweb /
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 17 Mar 2006 11:52:09 +0000 (11:52 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 17 Mar 2006 11:52:09 +0000 (11:52 +0000)
1  2 
setup

diff --cc setup
Simple merge