Merge tag 'upstream/0.6.1'
authorgregor herrmann <gregoa@debian.org>
Thu, 11 Sep 2014 20:00:39 +0000 (22:00 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 11 Sep 2014 20:00:39 +0000 (22:00 +0200)
Upstream version 0.6.1


Trivial merge