[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. debian/5.4.3-1-52-g680a22b

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=680a22b

The following commit has been merged in the kubuntu_unstable branch:
commit 680a22bdaf4bc635c8f9af9b4944d6bde48167b0
Merge: 7543a1e60c9d5d5f8b0a5d42ccf9be69067eb8a4 38161d4af8b336062e0b4312b3414dfdf0dd0939
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Feb 4 00:10:15 2016 +0000

    Fixing merge conflict

 debian/changelog | 12 +++++++-----
 debian/control   |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

-- 
plasma-desktop packaging