From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Wed, 30 Nov 2011 02:44:14 +0000 (+0100)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/881deb41fb7c5af8c5feedd075c780f3ce94df99?ds=sidebyside;hp=881deb41fb7c5af8c5feedd075c780f3ce94df99

Merge branch 'master' of github.com:RichiH/vcsh

Conflicts:
	vcsh
---