Merge tag 'upstream/0.5.0+svn5104_dfsg1'
authorReinhard Tartler <siretart@tauware.de>
Sat, 22 Feb 2014 13:29:55 +0000 (13:29 +0000)
committerReinhard Tartler <siretart@tauware.de>
Sat, 22 Feb 2014 13:29:55 +0000 (13:29 +0000)
Upstream version 0.5.0+svn5104~dfsg1


Trivial merge