[fence-agents/f19: 6/6] Merge remote-tracking branch 'origin/f20' into f19

[Marek Grác]

commit 52a56af11558efb6cc15054d43afc1bb67d44f20
Merge: d4a1396 a12f67b
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Tue Sep 3 16:10:49 2013 +0200

    Merge remote-tracking branch 'origin/f20' into f19

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