Merge tag 'upstream/2.11'
authorgregor herrmann <gregoa@debian.org>
Tue, 13 May 2014 20:05:45 +0000 (22:05 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 13 May 2014 20:05:45 +0000 (22:05 +0200)
Upstream version 2.11


Trivial merge