[SCM] kopete packaging branch, master, updated. debian/4.14.1-1-4-g46012c9

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=e4a58f7

The following commit has been merged in the master branch:
commit e4a58f7bfa9f2e0073f1707cf2675e20c39124e0
Author: Pino Toscano <pino at debian.org>
Date:   Sun Oct 5 16:29:19 2014 +0200

    Revert "Merge commit '5d681376d396d9cbe9cf340d026de3178b059402'"
    
    Yet another case of "fill debian packages uselessy with kubuntu
    changes"
    
    This reverts commit a6629aa4827ae34d9e6e6c08a2100ba5fc5fe8e3, reversing
    changes made to d2f97edb92b51c8bf69fd7431f29e2274a3b797b.
    
    Conflicts:
    	debian/control
---
 debian/changelog | 4247 ------------------------------------------------------
 debian/control   |   10 +-
 2 files changed, 3 insertions(+), 4254 deletions(-)

The diff has been stripped from this email because it exceeds 50KB


-- 
kopete packaging