Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Tue, 27 May 2014 12:09:48 +0000 (14:09 +0200)
committerMichael Vogt <mvo@debian.org>
Tue, 27 May 2014 12:09:48 +0000 (14:09 +0200)

Trivial merge