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

[Adam Miller]

commit 2518f910ac5e350fd5636ad882ea81cf7d11c188
Merge: cd943e1 e5742e4
Author: Adam Miller <admiller at redhat.com>
Date:   Wed Jul 2 16:58:27 2014 -0500

    Merge branch 'master' into f20
    
    * master:
      update to latest HEAD commit 6850c8d in upstream master

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