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

[Nikos Mavrogiannopoulos]

commit 51030504e220b7e1e21c9d73f49f583f70348ef3
Merge: d983fbb be8bda6
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Wed Aug 27 14:24:11 2014 +0200

    Merge branch 'master' into f21

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