[fence-agents: 5/5] Merge branch 'master' of ssh://pkgs.fedoraproject.org/fence-agents

[Marek Grác]

commit e0de6f635281062f664dcb31a879367178b661a0
Merge: 4a7525d 17f5798
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Tue Jul 1 14:51:05 2014 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/fence-agents
    
    Conflicts:
    	fence-agents.spec

 fence-agents.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---