[SCM] khotkeys packaging branch, kubuntu_vivid_archive, updated. 051f041d0ae3f45bc26ed2196508ec6ce2b7bd21

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/khotkeys.git;a=commitdiff;h=051f041

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 051f041d0ae3f45bc26ed2196508ec6ce2b7bd21
Merge: 9f77ff24d3c117f935422c7f379b1ab2056f7aff 557f3135ed0b762e5116f05c7d424a6730a02a0a
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Thu Mar 19 22:06:16 2015 +0000

    Merging remotes/origin/kubuntu_stable into kubuntu_unstable.

 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

-- 
khotkeys packaging