Merge branch 'dg/git-daemon-run' into debian-sid
commitdc4e5ef116c3efc78882ed3430a7fd2921406ba5
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 28 May 2011 04:26:43 +0000 (27 23:26 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Sat, 28 May 2011 04:26:43 +0000 (27 23:26 -0500)
treec7cd7b1a0b83f1222a640862b8a9200392886296
parent02d197c95c63c98d7f360dfc91b18e482037f44e
parent179bc71cb09b4ce74c3c23e7038aadb59530dfb1
Merge branch 'dg/git-daemon-run' into debian-sid

* dg/git-daemon-run:
  clarify debian/changelog
  debian/git-daemon-run: allow purge with active connections
  debian/git-daemon-run: disable TCP quiet period when restarting
  debian/git-daemon-run: allow package to be removed and purged in one step
  debian/changelog: prepare for upload to stable
  debian: new upstream point release

Conflicts:
debian/changelog
debian/changelog.upstream
debian/control
debian/diff/0008-gitweb-make-logo-optional.diff
debian/git-daemon-run.postrm
debian/versions.upstream
debian/changelog