[SCM] kactivities packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-5-gfd1f7ae

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit fd1f7ae70734dff0194a0fd0ec06a75a84b339f2
Merge: 74f4b55f0b08a358529f545af298bf714a8a62dd 3353b7580cbaba3f34815d76134d178532614852
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:05:54 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 27ccd1d,5616cb0..d0bee3c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ kactivities-kf5 (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:02:58 -0700
+ 
 +kactivities-kf5 (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>  Mon, 29 Jun 2015 13:46:38 +0200
 +
  kactivities-kf5 (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kactivities packaging