[SCM] kiconthemes packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-9-g8e42630

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8e42630538020ebbeeb3e1a4a0b52d88241f6dde
Merge: ca8b87f19405d1a991b63272984d4eb3666424ec 2be65c34d533b2169854530e759c2da99f31c88c
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 11:03:43 2015 -0700

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

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

diff --cc debian/changelog
index 81da527,9f752a2..02f6f02
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,26 @@@
+ kiconthemes (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:20:04 -0700
+ 
+ kiconthemes (5.10.0-0ubuntu1) wily; urgency=medium
+ 
++ [ Jonathan Riddell ]
++  * New upstream release
++
++ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 28 Jun 2015 16:02:29 +0200
++
 +kiconthemes (5.11.0-1) unstable; urgency=medium
 +
    [ Maximiliano Curia ]
    * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 16:02:29 +0200
 +
 +kiconthemes (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Jonathan Riddell ]
    * New upstream release

-- 
kiconthemes packaging