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

Trivial merge