Merge branches 0.3.48
authorMichael Prokop <mika@grml.org>
Mon, 11 Feb 2008 17:01:34 +0000 (18:01 +0100)
committerMichael Prokop <mika@grml.org>
Mon, 11 Feb 2008 17:01:34 +0000 (18:01 +0100)
1  2 
etc/zsh/zshrc

diff --cc etc/zsh/zshrc
Simple merge