[SCM] kdoctools packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-12-g18f3f11

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdoctools.git;a=commitdiff;h=18f3f11

The following commit has been merged in the kubuntu_unstable branch:
commit 18f3f11f1a14001c20b89b79192388e8f0e01062
Merge: c6c41a548306622e9f622c1cbf1cf0f65b6fb0e5 f3e72bc1c9c367d251994ed5eac4747ab4a55301
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:43:30 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 39e2c2f,5310178..f24c72a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kdoctools (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:16:10 -0700
+ 
 +kdoctools (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 27 Jun 2015 11:43:24 +0200
 +
  kdoctools (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kdoctools packaging