[certmonger/f21: 2/2] Merge remote-tracking branch 'origin/master' into f21

[Nalin Dahyabhai]

commit 327decad1d0085eee84f93c4464c30d7f527b30e
Merge: 22380b9 cedf1c3
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Tue Nov 18 10:10:38 2014 -0500

    Merge remote-tracking branch 'origin/master' into f21

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