Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Tue, 22 Apr 2014 13:19:17 +0000 (15:19 +0200)
committerMichael Vogt <mvo@debian.org>
Tue, 22 Apr 2014 13:19:17 +0000 (15:19 +0200)

Trivial merge