Merge branch 'master' of git://repo.or.cz/alt-git
authorJohannes Sixt <j6t@kdbg.org>
Tue, 30 Apr 2013 05:37:45 +0000 (30 07:37 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 30 Apr 2013 05:37:45 +0000 (30 07:37 +0200)

Trivial merge