Merge tag 'upstream/0.5.0_dfsg0'
authorAlessio Treglia <alessio@debian.org>
Sun, 27 May 2012 09:23:17 +0000 (11:23 +0200)
committerAlessio Treglia <alessio@debian.org>
Sun, 27 May 2012 09:23:17 +0000 (11:23 +0200)
Upstream version 0.5.0~dfsg0


Trivial merge