From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Dec 2008 20:12:11 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.00~4^2~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/17b2afe721d5b8fd2468fca56e91fe83bf49be64

Merge branch 'master' into next

Conflicts:

	debian/changelog
	po/ikiwiki.pot
---

17b2afe721d5b8fd2468fca56e91fe83bf49be64