Merge branch 'master' of git://repo.or.cz/alt-git
authorJohannes Sixt <j6t@kdbg.org>
Mon, 14 Jan 2013 06:37:04 +0000 (14 07:37 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Mon, 14 Jan 2013 06:37:04 +0000 (14 07:37 +0100)

Trivial merge