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

[Simon Quigley]

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

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

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

This change fixes the merge conflict in debian/control and merges the rest of the changes. (kubuntu_stable -> kubuntu_unstable)
-- 
Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-khelpcenter:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/khelpcenter:kubuntu_unstable.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 2416 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20160724/3e617e29/attachment.diff>