[SCM] kguiaddons packaging branch, master, updated. debian/5.37.0-2-83-gee95721

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit aa46ca0cdef1291ff0518230bb5122046a58de42
Merge: 56d94d96b56e8897183c31c7ee655832272ed243 921dc4979744005f8e32a8641d0346115f366b91
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:53:02 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 174fd02,7351edc..8031a9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kguiaddons (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:17:59 -0700
+ 
 +kguiaddons (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>  Fri, 26 Jun 2015 14:09:51 +0200
 +
  kguiaddons (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kguiaddons packaging