From: martin f. krafft <madduck@madduck.net>
Date: Fri, 30 Jul 2010 20:31:13 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/zsh
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9344d99cba5549c443f50159044706a777e502bc;hp=9344d99cba5549c443f50159044706a777e502bc;p=zsh.git

Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/zsh

Conflicts:
	.zsh/func/giturl
---