From: Simon McVittie <smcv@debian.org>
Date: Wed, 26 Nov 2014 11:33:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.20150107~71
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/690cc823aeb234fb0ef4cf099302ad78fdd364f1

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

690cc823aeb234fb0ef4cf099302ad78fdd364f1