Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Thu, 29 May 2014 10:23:51 +0000 (12:23 +0200)
committerMichael Vogt <mvo@debian.org>
Thu, 29 May 2014 10:23:51 +0000 (12:23 +0200)

Trivial merge