Merge branch 'jk/do-not-run-httpd-tests-as-root'
commitfd800214384e60cc72272620bdde58f94746719e
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 17:06:05 +0000 (16 10:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 17:06:05 +0000 (16 10:06 -0700)
tree43ffe7c4fe9c20396c02b21bca1ebe9226669c66
parent499168af3b2a21e2d234a2093cb3c0f64e2f36a0
parenta1a301114e0ba3f60474d857c93d02890d00e65b
Merge branch 'jk/do-not-run-httpd-tests-as-root'

* jk/do-not-run-httpd-tests-as-root:
  t/lib-httpd: require SANITY prereq
t/lib-httpd.sh