Merge tag 'upstream/0.5.0+svn4288_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Wed, 30 Jan 2013 14:27:20 +0000 (14:27 +0000)
committerAlessio Treglia <alessio@debian.org>
Wed, 30 Jan 2013 14:27:20 +0000 (14:27 +0000)
Upstream version 0.5.0+svn4288~dfsg1


Trivial merge