[Merge] ~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-workspace:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/plasma-workspace:kubuntu_unstable

[Simon Quigley]

Simon Quigley has proposed merging ~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-workspace:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/plasma-workspace:kubuntu_unstable.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-workspace/+merge/301014

This fixes the merge conflict in debian/changelog that happened due to me and Rik both having an entry, I put mine below Rik's and merged.
-- 
Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-workspace:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/plasma-workspace:kubuntu_unstable.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 956 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20160725/8bba99ae/attachment-0001.diff>