Merge tag 'upstream/0.5.2-426-gc5ad4e4_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Tue, 9 Jun 2015 08:15:12 +0000 (09:15 +0100)
committerAlessio Treglia <alessio@debian.org>
Tue, 9 Jun 2015 08:15:12 +0000 (09:15 +0100)
commitb1c7708d9d2dd7bd50a6adcb507cf0f5e4abc2c9
treee85a46b94213230f7bb40df4a98087e89eec473b
parenteed6bf1194d03faee1a2fe3c41bdd6a919d25809
parent62521dc0f7707bdec548b21fb49398f0541ee9bb
Merge tag 'upstream/0.5.2-426-gc5ad4e4_dfsg1'

Upstream version 0.5.2-426-gc5ad4e4~dfsg1