Merge tag 'upstream/0.9.4+r4182.20140204'
authorgregor herrmann <gregoa@debian.org>
Thu, 6 Feb 2014 16:39:33 +0000 (17:39 +0100)
committergregor herrmann <gregoa@debian.org>
Thu, 6 Feb 2014 16:39:33 +0000 (17:39 +0100)
Upstream version 0.9.4+r4182.20140204


Trivial merge