Merge branch 'master' of git://repo.or.cz/alt-git
authorJohannes Sixt <j6t@kdbg.org>
Fri, 7 Dec 2012 06:35:10 +0000 (7 07:35 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 7 Dec 2012 06:35:10 +0000 (7 07:35 +0100)

Trivial merge