[crypto-policies/f21: 6/6] Merge branch 'master' into f21

[Nikos Mavrogiannopoulos]

commit 938ec811b7ab42f5705648fab3eedbf17ee15958
Merge: 9a7a34d 0582533
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Thu Aug 14 11:38:14 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	crypto-policies.spec

 .gitignore           |    2 ++
 crypto-policies.spec |   12 +++++++++---
 sources              |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---