From: Simon McVittie <smcv@debian.org>
Date: Thu, 21 Jan 2016 10:17:44 +0000 (+0000)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20160506_bpo8+1~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b63f1260eef70cf7eb1703ebae1244db7cef0583?ds=sidebyside;hp=b63f1260eef70cf7eb1703ebae1244db7cef0583

Merge branch 'master' into debian-jessie-backports
---