Merge branch 'master' of ..\gitk into devel
commite0d5779abeb74ab38f9399aa6495e269dcd81341
authorJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:11:15 +0000 (10 10:11 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:11:15 +0000 (10 10:11 +0100)
tree3c95e12ef11fc2408b3e13f6f468b5205e62b97f
parentf34be46e47773d03e9d09641209121591a6b37c8
parent76901621206c34e819a2d40df2fc62aba96b7d48
Merge branch 'master' of ..\gitk into devel
gitk-git/gitk