[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=b38f6e4

The following commit has been merged in the kubuntu_vivid_archive branch:
commit b38f6e48fbf1ed8efd477e26f579f86a519d5e47
Merge: e426ffc6b1e91849d3f9da93e5df3c38b184417e bd23676f40e7995b9a8315307841c649a2ae6f06
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Jan 26 12:51:56 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