[SCM] kemoticons packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-gde5d38a

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit de5d38a8390ad6f77c93c72ceb32560bd2d1e93b
Merge: 4f684c53abfb793e4a2ca28cb14608e45d0fee9b 3fdbbc185e4d62e99b3d2c0a3ae45cbc48ee7521
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:02:16 2015 +0200

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

 debian/changelog |  7 +++++++
 debian/control   | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 15e9c1d,0d71358..9aece23
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kemoticons (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>  Sun, 28 Jun 2015 16:03:48 +0200
+ 
 +kemoticons (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:50:37 +0200
 +
  kemoticons (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kemoticons packaging