Merge branch 'ps/gitweb-js-with-lineno' into next
commit9236f5e71f8604f1bea22afe1ade64e80d15fce1
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:41:57 +0000 (6 15:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:41:57 +0000 (6 15:41 -0700)
treea99bb0ff1d7d8adfc173d3e3f0b78be9eed2e485
parent0af69bb8f19d3fdca03f0401f168b10fa5132fdc
parent2b07ff3ffa04a3d52bb4aec9df9f8b6378e2f2a7
Merge branch 'ps/gitweb-js-with-lineno' into next

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