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

[Simon Quigley]

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

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

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

This pull request fixes the merge conflicts in the debian/changelog file.
-- 
Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-ark:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/ark:kubuntu_unstable.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 609 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20160724/51cd0e65/attachment-0001.diff>