From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Jun 2011 23:43:23 +0000 (-0700)
Subject: Merge branch 'instaweb' of git://bogomips.org/git-svn
X-Git-Tag: v1.7.7-rc0~127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5dc6411edc6ed5d822b65b9f5cf61ab6fe6d3fa8;p=git.git

Merge branch 'instaweb' of git://bogomips.org/git-svn

* 'instaweb' of git://bogomips.org/git-svn:
  git-instaweb: Check that correct config file exists for (re)start
  git-instaweb: Move all actions at the end of script
  git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
  git-instaweb: Extract configuring web server into configure_httpd
---

5dc6411edc6ed5d822b65b9f5cf61ab6fe6d3fa8