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

Trivial merge