[SCM] kscreen packaging branch, kubuntu_unstable, updated. debian/1.0.2.1-1-20-g87ef2f3

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 87ef2f30bddea2fb3f3204d986334efc0853acc2
Merge: 2444438190d481400ba0ca79db1a0df0e32c5044 145e109e52946683867f12e3550b2b0156fab12d
Author: Rohan Garg <rohan at kde.org>
Date:   Mon Jan 19 18:48:40 2015 +0100

    Merge branch 'kubuntu_vivid_archive' into kubuntu_unstable
    
    Conflicts:
    	debian/meta/upstream_scm.json

 debian/meta/upstream_scm.json | 4 ----
 1 file changed, 4 deletions(-)

-- 
kscreen packaging