Merge tag 'upstream/2.2'
authorgregor herrmann <gregoa@debian.org>
Sun, 25 May 2014 18:10:08 +0000 (20:10 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 25 May 2014 18:10:08 +0000 (20:10 +0200)
Upstream version 2.2


Trivial merge