Merge branch 'jk/do-not-run-httpd-tests-as-root' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:24:16 +0000 (13:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:24:16 +0000 (13:24 -0700)
commit745b05c226b9d4e023ad171121ff5dc9f646521e
tree337ec87305da86b413b36ebb295cc7742fdf90a8
parentff697229b43826f64c133c9625f8822e6411d71f
parenta1a301114e0ba3f60474d857c93d02890d00e65b
Merge branch 'jk/do-not-run-httpd-tests-as-root' into next

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