[SCM] kross packaging branch, master, updated. debian/5.37.0-2-80-ge4fd914

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 663415867b86d2680d31a580d2befcbc37facd82
Merge: 86247410d41914bfa6621d971abe17e70f43f429 0c05a1c487c3bd59f557f431019636af64a67597
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 14:09:36 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 246a004,ebbe9d5..fa1373f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,9 -2,8 +2,9 @@@ kross (5.12.0-0ubuntu1) wily; urgency=m
  
    * New upstream release
    * Fix merge.
 +  * Vivid backport. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:22:28 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 16:08:29 +0200
  
  kross (5.11.0-1) unstable; urgency=medium
  

-- 
kross packaging