Merge branch 'master' of git.ganneff.de:zsh
authorJoerg Jaspert <joerg@debian.org>
Tue, 26 Mar 2013 20:13:50 +0000 (21:13 +0100)
committerJoerg Jaspert <joerg@debian.org>
Tue, 26 Mar 2013 20:13:50 +0000 (21:13 +0100)
* 'master' of git.ganneff.de:zsh:
  multiple changes: New functions, dropped functions, ...

1  2 
.zsh/30_Options.zsh

Simple merge