[sssd/f21: 4/4] Merge branch 'master' into f21

[Stephen Gallagher]

commit 0d6cda6a212517b451acd2ee10c41cff13cd89c0
Merge: dbe69cb f73310e
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Jul 10 12:43:20 2014 -0400

    Merge branch 'master' into f21
    
    Conflicts:
    	sssd.spec

 sssd.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---