Merge branch 'jm/instaweb-apache-24' into maint
commitaf3e5d1b2af6322621f26791abf8d619771f04e2
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:25:24 +0000 (22 10:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:25:24 +0000 (22 10:25 -0700)
tree9530bce05e091cc9ef7b563b2593bc0b4f4606bb
parentcfececfe1ff1554783030a6f08b431ad50263800
parentf8ee1f02da6182a3242306a52c5ae7a39547b37e
Merge branch 'jm/instaweb-apache-24' into maint

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