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-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/b1c9ca545bd58a8db665e06c5867ede2fe94e32a

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

b1c9ca545bd58a8db665e06c5867ede2fe94e32a