From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Jun 2013 21:53:17 +0000 (-0700)
Subject: Merge branch 'jk/apache-test-for-2.4'
X-Git-Tag: v1.8.4-rc0~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23983a473dc889cfba8a64f040942298a6f5f99a;p=git

Merge branch 'jk/apache-test-for-2.4'

* jk/apache-test-for-2.4:
  lib-httpd/apache.conf: check version only after mod_version loads
  t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
  t/lib-httpd/apache.conf: load compat access module in apache 2.4
  t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
  t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
---

23983a473dc889cfba8a64f040942298a6f5f99a