Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Wed, 7 May 2014 16:09:11 +0000 (18:09 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 7 May 2014 16:09:11 +0000 (18:09 +0200)

Trivial merge