Merge tag 'upstream/0.5.0+svn5294_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Mon, 7 Jul 2014 16:18:20 +0000 (17:18 +0100)
committerAlessio Treglia <alessio@debian.org>
Mon, 7 Jul 2014 16:18:20 +0000 (17:18 +0100)
Upstream version 0.5.0+svn5294~dfsg1


Trivial merge