From: Jon Dowland <jon@alcopop.org>
Date: Fri, 16 Oct 2009 09:59:56 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20091017~11^2~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b1c9ca545bd58a8db665e06c5867ede2fe94e32a?hp=-c

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

b1c9ca545bd58a8db665e06c5867ede2fe94e32a