Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
authorMichael Vogt <mvo@ubuntu.com>
Mon, 5 May 2014 14:03:03 +0000 (16:03 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Mon, 5 May 2014 14:03:03 +0000 (16:03 +0200)

Trivial merge