[Merge] ~wxl/kubuntu-packaging/+git/kactivitymanagerd:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/discover:kubuntu_unstable

[Walter Lapchynski]

Walter Lapchynski has proposed merging ~wxl/kubuntu-packaging/+git/kactivitymanagerd:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/discover:kubuntu_unstable.

Requested reviews:
  Simon Quigley (tsimonq2)

For more details, see:
https://code.launchpad.net/~wxl/kubuntu-packaging/+git/kactivitymanagerd/+merge/310608

Merge kubuntu_zesty_archive into kubuntu_unstable, fixing http://kci.pangea.pub/job/merger_kactivitymanagerd/257/consoleFull

Just needed to do a wee switcheroo on one of José's bulletpoints in the changelog.
-- 
Your team Kubuntu Packagers is subscribed to branch ~kubuntu-packagers/kubuntu-packaging/+git/discover:kubuntu_unstable.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 13536 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20161111/f735e98d/attachment-0001.diff>