From: Richard Hartmann <richih@debian.org>
Date: Fri, 21 Feb 2014 22:41:29 +0000 (+0100)
Subject: Merge branch 'feature/gitattributes'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/a7ec1feb5aaa690f1360f8c4f91d670bb3787752?ds=sidebyside;hp=a7ec1feb5aaa690f1360f8c4f91d670bb3787752

Merge branch 'feature/gitattributes'

Conflicts:
	vcsh
---