Merge tag 'upstream/2.08'
authorgregor herrmann <gregoa@debian.org>
Sun, 13 Apr 2014 15:34:12 +0000 (17:34 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 13 Apr 2014 15:34:12 +0000 (17:34 +0200)
Upstream version 2.08


Trivial merge