[lightdm/epel7: 58/58] Merge branch 'master' into epel7

[Rex Dieter]

commit 06c8aad902ae641491a684405f6e610ad5009da5
Merge: 9642e86 d0feb2f
Author: Rex Dieter <rdieter at gmail.com>
Date:   Thu Feb 19 18:09:56 2015 -0600

    Merge branch 'master' into epel7
    
    Conflicts:
    	lightdm-1.5.1-systemd_login1_power.patch
    	lightdm.spec

 .gitignore                               |   3 +-
 lightdm-1.10.2-fedora_config.patch       |  53 ++++++++
 lightdm-1.10.2-nodaemon_option.patch     |  12 ++
 lightdm-1.2.2-nodaemon_option.patch      |  12 --
 lightdm-1.5.1-systemd_login1_power.patch | 211 -----------------------------
 lightdm-1.6.0-fedora_config.patch        |  52 --------
 lightdm-1.6.0-gtkdoc_dup_flags.patch     |  25 ----
 lightdm-1.6.0-no_dmrc_save.patch         |  12 --
 lightdm-1.9.8-no_dmrc_save.patch         |  21 +++
 lightdm-lock-screen-before-switch.patch  |  55 --------
 lightdm.pam                              |   5 +-
 lightdm.pam.f19                          |  24 ++++
 lightdm.preset                           |   2 -
 lightdm.spec                             | 221 +++++++++++++++++++++++--------
 sources                                  |   2 +-
 15 files changed, 278 insertions(+), 432 deletions(-)
---