[geard/epel7: 3/4] Merge branch 'master' into epel7

[Lokesh Mandvekar]

commit 415f9a3b26cbbc6d7b797b6815dfb803d526bb6b
Merge: ad8ec26 967623f
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org&gt;
Date:   Thu Aug 21 18:17:53 2014 -0500

    Merge branch 'master' into epel7

 .gitignore |    1 +
 geard.spec |   11 ++++++++---
 sources    |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---