Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2007 20:27:10 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2007 20:27:10 +0000 (13:27 -0700)
* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix bug causing undefined variable error when cherry-picking


Trivial merge