From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Wed, 9 Sep 2009 18:44:52 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Tag: 3.14159265~61^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f44dd8e7762827753c02dcd78d663c0fd9554b3;p=ikiwiki.git

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

5f44dd8e7762827753c02dcd78d663c0fd9554b3