]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jm/instaweb-apache-24'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:06 +0000 (12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:06 +0000 (12:18 -0700)
* jm/instaweb-apache-24:
  git-instaweb: add support for Apache 2.4


Trivial merge