From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 30 Jan 2008 00:28:51 +0000 (-0500)
Subject: Merge git://git.samba.org/jelmer/ikiwiki
X-Git-Tag: 2.30~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cddc335b2bd98a302b261200c12d61b05476d727;p=ikiwiki.git

Merge git://git.samba.org/jelmer/ikiwiki
---

cddc335b2bd98a302b261200c12d61b05476d727