From: Richard Hartmann <richih@debian.org>
Date: Wed, 5 Mar 2014 17:06:04 +0000 (+0100)
Subject: Merge branch 'feature/gitattributes'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/e1bb725d9adb0f1814bb5a8969a67feda631ea8b?hp=e1bb725d9adb0f1814bb5a8969a67feda631ea8b

Merge branch 'feature/gitattributes'

Conflicts:
	vcsh
---