Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:35 +0000 (16:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:35 +0000 (16:12 -0700)
commit58f75bcf323e86067147ac66bbb493e6a8c2631f
tree02c2830b9ef3fbc7ac83b0f6f76d39ab81f4245b
parent87d99c64dfa8880592104245896557aa530d4fd9
parent2b07ff3ffa04a3d52bb4aec9df9f8b6378e2f2a7
Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6

* ps/gitweb-js-with-lineno:
  gitweb: Fix links to lines in blobs when javascript-actions are enabled