[SCM] threadweaver packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-5-g0924840

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 60040353015d1de52e501ae270237eac6eecdca5
Merge: 668f9591e744fd96eadf50f7c8d8ec5c3e6040e2 439ce447db236f57f2d1a609fa40a2ffd4bcf012
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Jun 30 17:07:37 2015 +0200

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

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

diff --cc debian/changelog
index 7dbbaa4,60d7c4f..06a3b59
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,18 @@@
- threadweaver (5.10.0-0ubuntu1) wily; urgency=medium
+ threadweaver (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 14:11:58 +0200
+ 
++threadweaver (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:05:15 +0200
 +
  threadweaver (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
threadweaver packaging