[SCM] plasma-desktop packaging branch, master, updated. 3a008c7c6b669f2fd617ac895f1dc03658edceef

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d01dfa28081a1bfd2f9d6341e40db41cae5579b6
Merge: f0897836ade57d6ade45842bb65c364cc1de99dd 4d64a518cb7e8d1e009830f11d092d4940802114
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 10 20:39:49 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_stable'
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/meta/upstream_scm.json | 1 +
 1 file changed, 1 insertion(+)

-- 
plasma-desktop packaging