Merge tag 'upstream/2.2.31'
authorAndreas Tille <tille@debian.org>
Tue, 12 Apr 2016 10:45:52 +0000 (12:45 +0200)
committerAndreas Tille <tille@debian.org>
Tue, 12 Apr 2016 10:45:52 +0000 (12:45 +0200)
commit67ada7b3a80c3d77fa2f6b7fedb53b638b715e15
treef351fb9c741dfa347f64471fd85dbbc3dff25317
parentc085268c1528238f475c86e33e5566e3c50b5d46
parent03c4257c90dabff2b5ffe63c03acfee26e2eebc5
Merge tag 'upstream/2.2.31'

Upstream version 2.2.31