Merge branch 'master' of git://ozlabs.org/~paulus/gitk
commit6f3330efafbc978fed77ec239cea6ec525515053
authorJohannes Sixt <j6t@kdbg.org>
Wed, 2 Jul 2014 06:29:30 +0000 (2 08:29 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Wed, 2 Jul 2014 06:29:30 +0000 (2 08:29 +0200)
tree9da3e3b76e633fdc6ebcdf24576395deade2dedb
parent9f8184cff7128a1d61b9d0afe0a7155dbc852e6b
parentbde4a0f9f3035d482a80c32b4a485333b9ed4875
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
gitk