Updated version 2.5.0 from 'upstream/2.5.0'
authorOlivier Sallou <olivier.sallou@debian.org>
Thu, 1 Dec 2016 13:39:29 +0000 (14:39 +0100)
committerOlivier Sallou <olivier.sallou@debian.org>
Thu, 1 Dec 2016 13:39:29 +0000 (14:39 +0100)
with Debian dir e6f7d6e5bafd2b66fe885214be2aeb69a94e79f6


Trivial merge