[SCM] KDE Discover packaging branch, kubuntu_unstable, updated. f6c2e4b46e9b6de61180dff0643321b07c05f431

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit f6c2e4b46e9b6de61180dff0643321b07c05f431
Merge: 975fed8029315cfeffae5e32ff7d435ee8cf3905 785c1bd00c03889990f25b1bc6a373af093500e2
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Mar 5 07:30:36 2016 -0800

    Fix merger.

 debian/changelog     | 6 ++++--
 debian/not-installed | 4 ++++
 debian/rules         | 3 ---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 6aeadd1,33bc127..6ac4f91
--- a/debian/changelog
+++ b/debian/changelog
@@@ -23,4 -22,4 +22,7 @@@ plasma-discover (5.5.4-0ubuntu1) UNRELE
    * Update debian/watch
    * Update Vcs-* URLs
  
++  [ Scarlett Clark ]
++  * Fix merger. 
++
   -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 17:58:43 +0000

-- 
KDE Discover packaging