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

Trivial merge