[SCM] kemoticons packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-g1c42954

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 1c42954189a5d64c11c2fc706329b1cb4bc681b4
Merge: de5d38a8390ad6f77c93c72ceb32560bd2d1e93b 8624043c3b18d4e2373ca49eaedeb6cada97bd2d
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:48:30 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 9aece23,4d0af36..45dfef3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kemoticons (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:16:47 -0700
+ 
 +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 ]

-- 
kemoticons packaging