Merge tag 'upstream/0.4.5+svn3950_dfsg0' into master.experimental
authorAlessio Treglia <alessio@debian.org>
Tue, 6 Mar 2012 22:40:24 +0000 (23:40 +0100)
committerAlessio Treglia <alessio@debian.org>
Tue, 6 Mar 2012 22:40:24 +0000 (23:40 +0100)
Upstream version 0.4.5+svn3950~dfsg0


Trivial merge