From: Peter Gammie <peteg42@gmail.com>
Date: Thu, 30 Sep 2010 23:48:03 +0000 (+1000)
Subject: Merge branch 'joey' into revert
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eba5c715144024f4784538af256ffa9d7fcb8a2d;p=ikiwiki.git

Merge branch 'joey' into revert
---

eba5c715144024f4784538af256ffa9d7fcb8a2d