[SCM] kguiaddons packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-g56d94d9

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 56d94d96b56e8897183c31c7ee655832272ed243
Merge: 4e662355c7102efcf6ccc65e7fab03c10be5b8d9 41582fec6721f569e30bda67f0ff440fa00e0272
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:02:22 2015 +0200

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

 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 0ba50cc,3db3894..174fd02
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ 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 ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:52:46 +0200
 +
  kguiaddons (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kguiaddons packaging