From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Aug 2010 16:01:16 +0000 (-0400)
Subject: Merge branch 'debian-testing'
X-Git-Tag: 3.20100831~72
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=91f5697025ce92e64ad9d02c122d6a8d6df22278

Merge branch 'debian-testing'

Conflicts:
	debian/changelog
---

91f5697025ce92e64ad9d02c122d6a8d6df22278