Merge branch 'maint'
commit2cf08b6a0ab09f1b81b78a5686a632a2a602abf4
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Jan 2011 07:48:47 +0000 (8 23:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Jan 2011 07:48:47 +0000 (8 23:48 -0800)
tree2182e1734cf573e0698282c3407b9238a239e7b0
parente17aa8a9dca972ca278dd91a097873101066e964
parentb393515f8ef43d5e873502dd80205233933389a1
Merge branch 'maint'

* maint:
  Mark gitk script executable
gitk-git/gitk