[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a389ce4

The following commit has been merged in the master branch:
commit a389ce41fba3c2b6f7fa54e4e1f2c3f9f00dcd18
Merge: fb8fa53f8d019b33a42bd4bc40c7b01a40a366d9 c18661fdd3608551e0ed1f6881761de39874d543
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Fri Feb 14 13:03:37 2014 +0100

    Merge branch 'daemonsplit' into qmlsftp
    
    Conflicts:
    	kded/plugins/sftp/sftpplugin.cpp

 kded/plugins/sftp/README                  |  5 -----
 kded/plugins/sftp/kdeconnect_sftp.desktop | 34 ++-----------------------------
 2 files changed, 2 insertions(+), 37 deletions(-)

-- 
kdeconnect packaging