]> git.donarmstrong.com Git - zsh.git/commit
Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/zsh
authormartin f. krafft <madduck@madduck.net>
Fri, 30 Jul 2010 20:31:13 +0000 (22:31 +0200)
committermartin f. krafft <madduck@madduck.net>
Fri, 30 Jul 2010 20:31:13 +0000 (22:31 +0200)
commit9344d99cba5549c443f50159044706a777e502bc
tree3feacdcfadb4d44de4ed4ccb49105f05237f806b
parentc402c75132be2b7f5868f68114dbe7f8f873d4e2
parent9725c0dbc20d4bba1fb189f36a810778668aeed9
Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/zsh

Conflicts:
.zsh/func/giturl
.zsh/func/giturl