[SCM] kdesignerplugin packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-g5bba137

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 5bba1378d09c3f92ef2fcb3a3b6325b2f67e0f3e
Merge: 76b59938342a26cbe96069a3be5debb08d3b1299 e068223d57efa0006487af4360f85893ea2a74ac
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:15:41 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 1c8248a,a123402..e12f705
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kdesignerplugin (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:13:45 -0700
+ 
 +kdesignerplugin (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 13:46:51 +0200
 +
  kdesignerplugin (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kdesignerplugin packaging