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

diff --cc gitk-git/gitk
Simple merge