Merge branch 'jm/instaweb-apache-24'
commitbf2941be5daa278a4e866e820fc499e57d50714f
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:06 +0000 (16 12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:06 +0000 (16 12:18 -0700)
treec3bfebbf4417919047e7b00f55256e01c04c7275
parent474df928b11975d8c0ef532a3b61e1b86143406a
parentf8ee1f02da6182a3242306a52c5ae7a39547b37e
Merge branch 'jm/instaweb-apache-24'

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