[geard/epel7: 2/2] Merge branch 'master' into epel7

[Adam Miller]

commit ed5b025e8a305ad99af3336da86fd5b7d846b1e4
Merge: 9c1ef38 8e26515
Author: Adam Miller <admiller at redhat.com>
Date:   Mon Jul 21 15:55:43 2014 -0500

    Merge branch 'master' into epel7
    
    * master:
      New builds from upstream master at commit id 06df437

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