06c8aad Merge branch 'master' into epel7

Merged and Committed by rdieter 9 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	lightdm-1.5.1-systemd_login1_power.patch
    	lightdm.spec
    
        
file modified
+1 -2
lightdm-1.10.2-fedora_config.patch lightdm-1.6.0-fedora_config.patch
file renamed
+22 -21
file modified
+3 -2
file added
+24
file removed
-2
file modified
+163 -58
file modified
+1 -1