Merge tag 'upstream/0.5.0+svn4231_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Fri, 16 Nov 2012 12:19:11 +0000 (12:19 +0000)
committerAlessio Treglia <alessio@debian.org>
Fri, 16 Nov 2012 12:19:11 +0000 (12:19 +0000)
Upstream version 0.5.0+svn4231~dfsg1


Trivial merge