From: Simon McVittie <smcv@debian.org>
Date: Thu, 16 Oct 2014 23:02:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'
X-Git-Tag: debian/3.20141016
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0d1a4983db0c8e9d5735b00498212064b5f6b902

Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'
---

d922b1897c81db10b5b8a48d4b92e56a92d12448