Merge branch 'ps/gitweb-js-with-lineno'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:20 +0000 (15:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:20 +0000 (15:56 -0700)
commit59b32ff338da1bd61b0df60386802cfc2edcb54c
treee8e742f03475556781c9a5458ed048dc50ca8a80
parente579a5d398744e8182decff1329c468d59e6974c
parent2b07ff3ffa04a3d52bb4aec9df9f8b6378e2f2a7
Merge branch 'ps/gitweb-js-with-lineno'

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