[SCM] kunitconversion packaging branch, master, updated. debian/5.37.0-2-81-gbba8005

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4895891fd418b8b6b7f5535afc286ace869c2839
Merge: 5b2fb32779671c80a8c6ed25aa31abbe0a724f52 2b2a44607935993edaa3223f64e9ee3fe9be34f3
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Aug 3 14:11:15 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 df1223a,ddbd2a7..5735a21
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,9 -2,8 +2,9 @@@ kunitconversion (5.12.0-0ubuntu1) wily
  
    * New upstream release
    * Fix merge.
 +  * Vivid backport. 
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:25:41 -0700
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 16:10:10 +0200
  
  kunitconversion (5.11.0-1) unstable; urgency=medium
  

-- 
kunitconversion packaging