Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Thu, 20 Feb 2014 13:41:48 +0000 (14:41 +0100)
committerMichael Vogt <mvo@debian.org>
Thu, 20 Feb 2014 13:41:48 +0000 (14:41 +0100)

Trivial merge