From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 20:34:32 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Tag: 3.14159265~61^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe350e8b895be69471fad094fcdcf0b4c7d3beb3;p=ikiwiki.git

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

fe350e8b895be69471fad094fcdcf0b4c7d3beb3