Merge branch 'jm/instaweb-apache-24' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:25:24 +0000 (10:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:25:24 +0000 (10:25 -0700)
* jm/instaweb-apache-24:
git-instaweb: add support for Apache 2.4

Trivial merge