From: Jon Dowland <jon+ikiwiki@alcopop.org>
Date: Wed, 11 Nov 2009 19:12:47 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20091113~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3d947717a38a603d4baaec0fff93438935ca51a;p=ikiwiki.git

Merge branch 'master' of git://git.ikiwiki.info
---

a3d947717a38a603d4baaec0fff93438935ca51a