[SCM] plasma-workspace-wallpapers packaging branch, kubuntu_unstable, updated. 94d250fdb6fcf5a449f9c928c330916a78463b57

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace-wallpapers.git;a=commitdiff;h=94d250f

The following commit has been merged in the kubuntu_unstable branch:
commit 94d250fdb6fcf5a449f9c928c330916a78463b57
Merge: aca9e335cad998b5047bff3020f4119f8c6ff834 d5667864cc89a137279bffee017e4870e895ff52
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 19 12:31:37 2015 +0100

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

-- 
plasma-workspace-wallpapers packaging