[SCM] kdelibs4support packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-15-g352beaa

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 352beaa496ce437bb0974b5ed3ee6eff3deece28
Merge: a515e4f093da9d8596d7fc19b8579aee53a10936 7290b6a722aff7bf66b4a290225890083ad186b4
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:11:52 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 320c7eb,b16015f..4deedf5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kdelibs4support (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:13:01 -0700
+ 
 +kdelibs4support (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 15:51:33 +0200
 +
  kdelibs4support (5.10.0-0ubuntu1) wily; urgency=medium
  
    * New upstream release

-- 
kdelibs4support packaging