Merge branch 'master' into next
commit3eda2970212539418ce615b784cdeeeae9b51a65
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 00:28:21 +0000 (15 16:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 00:28:21 +0000 (15 16:28 -0800)
treeeeb0f9b2bf1d42b6c00d9e08f5ade49953b474f5
parent1af8ccad329b16a1428abaeb41053310404a65be
parent15368e1836970d87b5f29635b04c1d2144954f1f
Merge branch 'master' into next

* master:
  Git 1.6.4.5
  gitweb: Introduce esc_attr to escape attributes of HTML elements
gitweb/gitweb.perl