From: Simon McVittie <smcv@debian.org>
Date: Fri, 12 Sep 2014 20:40:24 +0000 (+0100)
Subject: Merge branch 'ready/comments'
X-Git-Tag: 3.20140916~49
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a55752a7bedb83fa5339f232b9a61a60a67251f3

Merge branch 'ready/comments'
---

a55752a7bedb83fa5339f232b9a61a60a67251f3