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

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

c36d2fa896e9ea42c0b6b0135ba04b4f4f60950f