Merge tag 'upstream/2.1+repack2'
authorAnton Gladky <gladk@debian.org>
Mon, 15 Aug 2016 20:30:06 +0000 (22:30 +0200)
committerAnton Gladky <gladk@debian.org>
Mon, 15 Aug 2016 20:30:06 +0000 (22:30 +0200)
Upstream version 2.1+repack2


Trivial merge