[lightdm/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit fb02fc8045d6a7426d1cd9c16fc1d038f341a81c
Merge: 989228a 252043e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Oct 9 06:25:13 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    2 +-
 lightdm.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---