Merge branch 'master' of git://repo.or.cz/alt-git
authorJohannes Sixt <j6t@kdbg.org>
Thu, 13 Jun 2013 06:12:44 +0000 (13 08:12 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Thu, 13 Jun 2013 06:12:44 +0000 (13 08:12 +0200)

Trivial merge