Merge git://ozlabs.org/~paulus/gitk
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2012 16:32:22 +0000 (09:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2012 16:32:22 +0000 (09:32 -0700)
commitcd82e584707bffdbb9553c6140e9a8fef130e5b8
treea02f88249221eb7f91f0e79a8dedb03b3f9ebce8
parentc528586a0cf0afc6aa18fbd060fa544e7e189c82
parent5be4d354d9031bee65406608bfbdfc0fbc85abdb
Merge git://ozlabs.org/~paulus/gitk

* git://ozlabs.org/~paulus/gitk:
  gitk: Fix GIT_TRACE issues
gitk-git/gitk