Merge tag 'upstream/0.12.2_dfsg1'
authorJaromír Mikeš <mira.mikes@seznam.cz>
Wed, 22 Jun 2016 12:40:40 +0000 (14:40 +0200)
committerJaromír Mikeš <mira.mikes@seznam.cz>
Wed, 22 Jun 2016 12:40:40 +0000 (14:40 +0200)
commit0de6384e97ea93c228f9e36decae6c063e21ca92
tree9912a3daec5ee245d25b1d7965cbd2ac2bb1f9ea
parent8a8b1d463ed5286b2f77e1d69140e94b6f2d39d8
parent00aad7734c74f9a174df158b873223768ed255ed
Merge tag 'upstream/0.12.2_dfsg1'

Upstream version 0.12.2~dfsg1