[fence-agents/f17: 5/5] Merge branch 'f18' into f17

[Marek Grác]

commit 0843a079c76d1442e826fb84c97da0964150f771
Merge: b05e545 afd921a
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Mon Nov 5 12:06:50 2012 +0100

    Merge branch 'f18' into f17
    
    Conflicts:
    	fence-agents.spec

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