From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 23 Dec 2008 22:22:57 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.00~4^2~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70dc0355bd547158ae29381f77eb6d809e0fefaa;p=ikiwiki.git

Merge branch 'master' into next

Conflicts:

	IkiWiki.pm
---

70dc0355bd547158ae29381f77eb6d809e0fefaa