merged
authorMichael Gebetsroither <michael.geb@gmx.at>
Fri, 1 Aug 2008 11:43:03 +0000 (13:43 +0200)
committerMichael Gebetsroither <michael.geb@gmx.at>
Fri, 1 Aug 2008 11:43:03 +0000 (13:43 +0200)
1  2 
etc/zsh/zshrc

diff --cc etc/zsh/zshrc
Simple merge