[SCM] kio-extras packaging branch, master, updated. 04581bb899d36c8a560536b19685772a26a5b83f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kio-extras.git;a=commitdiff;h=04581bb

The following commit has been merged in the master branch:
commit 04581bb899d36c8a560536b19685772a26a5b83f
Merge: 2c7bdf35aed6372b0d1d39c04ba312c3a9eccb15 1d298aaee0f5500a77dfc1c16d7433791dd5e971
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 10:01:35 2015 +0100

    Merge branch 'master' of git://git.debian.org/git/pkg-kde/plasma/kio-extras
    
    Conflicts:
    	debian/kio-extras.install

-- 
kio-extras packaging