From: Richard Hartmann <richih@debian.org>
Date: Thu, 19 Sep 2013 21:41:27 +0000 (+0200)
Subject: Merge branch 'feature--shortnames'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/b32b489829142ea899ed50913fcff931ef051c27?ds=inline;hp=b32b489829142ea899ed50913fcff931ef051c27

Merge branch 'feature--shortnames'

Conflicts:
	vcsh
---