From: Simon McVittie <smcv@debian.org>
Date: Mon, 15 Sep 2014 20:12:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.20140916~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bb46e3b3659d873ae552683833c998acd2e275f1

Merge remote-tracking branch 'origin/master'
---

bb46e3b3659d873ae552683833c998acd2e275f1