From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 11 Sep 2009 21:03:41 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Tag: 3.14159265~50^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a627f1853b4edcbe38dabcfca37fde477572ef5;p=ikiwiki.git

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

5a627f1853b4edcbe38dabcfca37fde477572ef5