Merge branch 'jm/instaweb-apache-24' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:35:56 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:35:57 +0000 (13:35 -0700)
commitecf20487aadece6834ccb1ad7e6c8072b85eed2c
tree1448ffe9ffdb6e7af729c0b2719a9e936c9fd8c6
parent13259fff88f21f0e2145e7f11a29bfa7c7f0f835
parentf8ee1f02da6182a3242306a52c5ae7a39547b37e
Merge branch 'jm/instaweb-apache-24' into next

* jm/instaweb-apache-24:
  git-instaweb: add support for Apache 2.4