[SCM] kcmutils packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-4-g1aacab1

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 1aacab17bf46a630f1f4007297e4668427b972a3
Merge: 6c0fcfac88a90bed669b8a113d27883eef791f7c 4c462053724b6361b41fd5f9c983e8417ab4f405
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:08:57 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog |  7 +++++++
 debian/control   | 30 +++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index 311b455,2a62509..04a9b46
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ 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 ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:48:10 +0200
 +
  kcmutils (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kcmutils packaging