[SCM] kpackage packaging branch, master, updated. debian/5.37.0-2-83-gd1244e3

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ee24b11332665140c0f6743442ed0388b5fe9374
Merge: 340302a5135ba0b6cdee0b535d927f2c4407cff1 c964279aec681c96b53026db79a9f51fe5359241
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 13:51:57 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 59745d4,f348bdf..90735e2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,9 -2,8 +2,9 @@@ kpackage (5.12.0-0ubuntu1) wily; urgenc
  
    * New upstream release
    + Fix merge.
 +  * Vivid backport. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:19:44 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 15:50:47 +0200
  
  kpackage (5.11.0-1) unstable; urgency=medium
  

-- 
kpackage packaging