Merge tag 'upstream/0.5.2-426-gc5ad4e4_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Tue, 9 Jun 2015 08:15:12 +0000 (09:15 +0100)
committerAlessio Treglia <alessio@debian.org>
Tue, 9 Jun 2015 08:15:12 +0000 (09:15 +0100)
Upstream version 0.5.2-426-gc5ad4e4~dfsg1


Trivial merge