[SCM] qtdoc packaging branch, master, updated. debian/5.5.1-1-17-g26e6630

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdoc.git;a=commitdiff;h=5ab096c

The following commit has been merged in the master branch:
commit 5ab096c718ed100d2616fccf04b994770fa0a801
Merge: 8b950bb88f356c3d4aa466cc2c01d95fbf4ab2d2 6f1b69d68cb8c8275904bbc8c5dbd361db0975ef
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jun 13 11:29:51 2016 -0300

    Merge branch 'experimental'
    
    Conflicts:
    	debian/control

 debian/changelog | 21 +++++++++++++++++++++
 debian/control   | 52 ++++++++++++++++++++++++++--------------------------
 2 files changed, 47 insertions(+), 26 deletions(-)

-- 
qtdoc packaging