Updated version 2.6.0 from 'upstream/2.6.0'
authorOlivier Sallou <osallou@debian.org>
Sun, 15 Jan 2017 17:12:12 +0000 (17:12 +0000)
committerOlivier Sallou <osallou@debian.org>
Sun, 15 Jan 2017 17:12:12 +0000 (17:12 +0000)
with Debian dir e42d5a2a50d036aecd1289ba1e5ef2e49790dfa4


Trivial merge