From: Amitai Schlair <schmonz@magnetic-babysitter.Ativa>
Date: Tue, 8 Sep 2009 17:08:49 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Tag: 3.14159265~61^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1332327f5e9fa394076b5a80b2678e9c2fa0bb48;p=ikiwiki.git

Merge branch 'master' of git://github.com/joeyh/ikiwiki
---

1332327f5e9fa394076b5a80b2678e9c2fa0bb48