[SCM] kemoticons packaging branch, master, updated. debian/5.37.0-2-86-gcaf9daf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f7bbe40ed14b0b86e1ce922c7c514eabe5ccda93
Merge: 66c522fd815e54ca108d5e7770d0485526732083 37c8f6bb147096b7144c0e3121c4986690fc11a0
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 12:31:06 2015 +0000

    Merging remotes/origin/kubuntu_wily_archive into kubuntu_unstable.

 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 71ba5e7,862e31f..d8dc5e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,9 -2,8 +2,9 @@@ kemoticons (5.12.0-0ubuntu1) wily; urge
  
    * New upstream release
    * Fix merge. Remove unused broken backport.
 +  * Vivid backport
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:07:41 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:29:40 +0200
  
  kemoticons (5.11.0-1) unstable; urgency=medium
  

-- 
kemoticons packaging