Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 06:14:08 +0000 (08:14 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 06:14:08 +0000 (08:14 +0200)

Trivial merge