[SCM] KDE Network module packaging branch, kde4.10, updated. debian/4.10.4-1-12-g54e41cf

[Pino Toscano]

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

The following commit has been merged in the kde4.10 branch:
commit 363ad984498a4b082afba4568aa565fe65ad6752
Merge: bb3ac0bd640df53800eec76e84535ba330ae7a04 4b8dcf4ceb631ba7e341c47e5cb2f4ab26a6e790
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 23 18:51:42 2013 +0200

    Merge remote-tracking branch 'origin/master' into kde4.10
    
    Conflicts:
    	debian/changelog
    	debian/kopete.install
    	debian/krfb.lintian-overrides

 debian/kopete.install                 |    1 -
 debian/patches/series                 |    1 +
 debian/patches/upstream_r1353735.diff |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

-- 
KDE Network module packaging