From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 14:55:28 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/a3f4077c3667898ec39acbd6e25c04e82e98c0b2

Merge commit 'origin/master'
---

a3f4077c3667898ec39acbd6e25c04e82e98c0b2