Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Tue, 22 Apr 2014 14:21:05 +0000 (16:21 +0200)
committerMichael Vogt <mvo@debian.org>
Tue, 22 Apr 2014 14:21:05 +0000 (16:21 +0200)

Trivial merge