[fence-agents/f20: 2/2] Merge branch 'master' into f20

[Marek Grác]

commit a610cfe5efd84cef4a100948281bf22a9bbaf71d
Merge: bab5272 0b9e5de
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Fri May 16 13:20:28 2014 +0200

    Merge branch 'master' into f20

 .gitignore        |    1 +
 fence-agents.spec |   23 +++++++++++++++++++++--
 sources           |    2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)
---