From: Peter Gammie <peteg42@gmail.com>
Date: Sat, 2 Oct 2010 05:06:10 +0000 (+1000)
Subject: Merge branch 'joey' into revert
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab9d6bae95821a117642ef96e708a26b2ad9953b;p=ikiwiki.git

Merge branch 'joey' into revert
---

ab9d6bae95821a117642ef96e708a26b2ad9953b