[SCM] kparts packaging branch, master, updated. debian/5.37.0-2-83-g5a53f7e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 04b09e51e200f1c2f0ea201adb48b940dd598466
Merge: 4d37856977b1c527c7ed8000c08ab24ee582a27c d72e689d9119e5cb916a60459349f9f4d217a698
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 14:08:24 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 20c0f6a,6010419..ca60345
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,9 -2,8 +2,9 @@@ kparts (5.12.0-0ubuntu1) wily; urgency=
  
    * New upstream release
    *  Fix merge.
 +  * Vivid backport. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:20:19 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 15:51:04 +0200
  
  kparts (5.11.0-1) unstable; urgency=medium
  

-- 
kparts packaging