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)
* git://ozlabs.org/~paulus/gitk:
  gitk: Fix GIT_TRACE issues

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
Simple merge