Merge branch 'master' of git://repo.or.cz/alt-git
authorJohannes Sixt <j6t@kdbg.org>
Tue, 23 Jul 2013 06:14:55 +0000 (23 08:14 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 23 Jul 2013 06:14:55 +0000 (23 08:14 +0200)

Trivial merge