Merge tag 'upstream/0.5.0+svn5324_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Thu, 31 Jul 2014 13:11:51 +0000 (14:11 +0100)
committerAlessio Treglia <alessio@debian.org>
Thu, 31 Jul 2014 13:11:51 +0000 (14:11 +0100)
Upstream version 0.5.0+svn5324~dfsg1


Trivial merge