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

Trivial merge