From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 10:17:45 +0000 (+0000)
Subject: Merge commit 'origin/comments' into comments-joey
X-Git-Tag: 2.71~10^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cdccf7a80cbcc74f0f8337668e80d0cd3ce594a3;p=ikiwiki.git

Merge commit 'origin/comments' into comments-joey
---

cdccf7a80cbcc74f0f8337668e80d0cd3ce594a3