Merge branch 'master' into next
commit0ee1fd1aafee90d0d39349401d95ef0462c34fdc
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Jan 2011 07:48:57 +0000 (8 23:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Jan 2011 07:48:57 +0000 (8 23:48 -0800)
treebeb37419437a082bb8cf265ab6ed57a33a6e9ad6
parent600460d4cecafb34f969eb58852adfcb96bc9732
parent2cf08b6a0ab09f1b81b78a5686a632a2a602abf4
Merge branch 'master' into next

* master:
  Mark gitk script executable