[sanlock/f21: 2/2] Merge branch 'f21' of ssh://pkgs.fedoraproject.org/sanlock into f21

[David Teigland]

commit 42654536771fc5fec7809c9f1109e7e18571f672
Merge: b452e75 57580ba
Author: David Teigland <teigland at redhat.com>
Date:   Mon Aug 18 14:54:31 2014 -0500

    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/sanlock into f21
    
    Conflicts:
    	sanlock.spec

---