Merge branch 'master' of git://repo.or.cz/alt-git
authorJohannes Sixt <j6t@kdbg.org>
Thu, 14 Nov 2013 06:31:16 +0000 (14 07:31 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Thu, 14 Nov 2013 06:31:16 +0000 (14 07:31 +0100)

Trivial merge