[SCM] kcmutils packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-6-gddb5a56

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit ddb5a569e054f9e9f2e10b20160cbd1772fb1c81
Merge: 1aacab17bf46a630f1f4007297e4668427b972a3 31f2a71f9523d39bc857ad94455622433febf8c3
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:28:05 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 04a9b46,e9e3501..54f956f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kcmutils (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:06:32 -0700
+ 
 +kcmutils (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>  Mon, 29 Jun 2015 12:35:43 +0200
 +
  kcmutils (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kcmutils packaging