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)
commitc41261f5f6bf29b7016747d92930a6f2c2a2a224
tree997f0f58a27ce8c33e618cd05edd0a897527e7b3
parent2cf190c48d7a9f6cfc244a9a5fb94b263c91a820
parent30f23e2d4aed7c7a734d551255a2091be5790969
Merge tag 'upstream/0.5.0+svn5104_dfsg1'

Upstream version 0.5.0+svn5104~dfsg1