Merge branch 'master' of git://repo.or.cz/alt-git
commitf16c856d4fc30e2111382b5a1cac797efd353eba
authorJohannes Sixt <j6t@kdbg.org>
Fri, 27 Jun 2014 05:34:50 +0000 (27 07:34 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 27 Jun 2014 05:34:50 +0000 (27 07:34 +0200)
tree09a5e8adf02c49672bc0f0a70922e767e4c8a641
parentc83705e13e016de94d52dafecc6e39dd4849a199
parentea0e524ebd60f87546a9998e447d307d3f51a3e3
Merge branch 'master' of git://repo.or.cz/alt-git
gitk-git/gitk