[SCM] sddm packaging branch, kubuntu_vivid_archive, updated. 1a47ad3360d9414a2f2d2e8adef9e5a5da70dd73

Thu Nov 20 12:05:16 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=1a47ad3

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 1a47ad3360d9414a2f2d2e8adef9e5a5da70dd73
Merge: 3e7513bc2c66db5150f548e84fdcacab3468b5e0 a1ea5d33b500913689caced26f40a232c39053ff
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 20 13:05:11 2014 +0100

    Merge branch 'master' into kubuntu_vivid_archive
    
    Conflicts:
    	debian/sddm.sddm-autologin.pam

 debian/control                 |  3 ++-
 debian/sddm.pam                | 12 ++++++++++--
 debian/sddm.sddm-autologin.pam | 11 +++++++++--
 debian/sddm.sddm-greeter.pam   | 11 +++++++++--
 4 files changed, 30 insertions(+), 7 deletions(-)

-- 
sddm packaging