Merge branch 'jk/do-not-run-httpd-tests-as-root'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 17:06:05 +0000 (10:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 17:06:05 +0000 (10:06 -0700)
* jk/do-not-run-httpd-tests-as-root:
t/lib-httpd: require SANITY prereq

1  2 
t/lib-httpd.sh
diff --cc t/lib-httpd.sh
Simple merge