[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=2f6751d

The following commit has been merged in the master branch:
commit 2f6751d00124a5651555887aec5bf17f39a4dd49
Merge: 877b55813bb609efee7da601dc8c19d2e2b84542 d38a77a043c79335aca6b8889000fc87e645b49b
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:47:52 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog | 7 +++++++
 debian/control   | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 652f6f4,d279919..9b55aee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kunitconversion (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 27 Jun 2015 12:58:43 +0200
+ 
 +kunitconversion (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:36:31 +0200
 +
  kunitconversion (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kunitconversion packaging