From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 4 Sep 2009 00:24:42 +0000 (-0500)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Tag: 3.14159265~61^2~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1888464a0d9de9cf4ac40c298924018437758aa2;p=ikiwiki.git

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

1888464a0d9de9cf4ac40c298924018437758aa2