Update upstream source from tag 'upstream/2.6'
authorgregor herrmann <gregoa@debian.org>
Tue, 9 Apr 2019 18:02:42 +0000 (20:02 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 9 Apr 2019 18:02:42 +0000 (20:02 +0200)
Update to upstream version '2.6'
with Debian dir ded2f54542cdbee356f5280898566622c307488c


Trivial merge