[SCM] kjobwidgets packaging branch, master, updated. debian/5.37.0-2-82-g21e6bd2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 86dcbc06f8295e4dea5bfb548896447e852e26fb
Merge: 3babc5dcc7d7217e71e84b3b88edfaf2a2600410 d51ff8f8d760512e8c8c3b69506ad2fec9f43916
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:57:23 2015 +0200

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

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

diff --cc debian/changelog
index 4eb475c,f59af3f..ffea788
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kjobwidgets (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:03:17 +0200
+ 
 +kjobwidgets (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:47:18 +0200
 +
  kjobwidgets (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kjobwidgets packaging