Merge branch 'master' into next
commit11ad7c908b7da9cc588ab5a3e665cc0e1ca494f0
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:23:30 +0000 (13 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:23:30 +0000 (13 11:23 -0700)
tree122158603b0a9d0b9e8256de0467dc8bace59d11
parent2f531d593c9ae0177d08f80333fc05253e58795e
parenta5080d8e10915daa57b5b42c887483d202b45c55
Merge branch 'master' into next

* master:
  add-interactive: Clarify “remaining hunks in the file”
  gitweb: Fix typo in hash key name in %opts in git_header_html
gitweb/gitweb.perl