Merge tag 'upstream/0.8.0'
authorAndreas Tille <tille@debian.org>
Tue, 19 Aug 2014 19:26:00 +0000 (21:26 +0200)
committerAndreas Tille <tille@debian.org>
Tue, 19 Aug 2014 19:26:00 +0000 (21:26 +0200)
Upstream version 0.8.0


Trivial merge