[sanlock: 2/2] Merge branch 'f17'

[David Teigland]

commit d890df7a8b55499b36c2f872cf504b896ac7597a
Merge: bf22c27 312c0bc
Author: David Teigland <teigland at redhat.com>
Date:   Mon Jul 23 09:53:54 2012 -0500

    Merge branch 'f17'
    
    Conflicts:
    	sanlock.spec
    
    Update to sanlock-2.4

 .gitignore   |    1 +
 sanlock.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc sanlock.spec
index 75cfbc1,143a49f..00d617b
--- a/sanlock.spec
+++ b/sanlock.spec
@@@ -177,9 -177,9 +177,12 @@@ developing applications that use %{name
  %{_includedir}/sanlock_direct.h
  
  %changelog
+ * Mon Jul 23 2012 David Teigland <teigland at redhat.com> - 2.4-1
+ - Update to sanlock-2.4
+ 
 +* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Fri Jun 15 2012 David Teigland <teigland at redhat.com> - 2.3-3
  - Require useradd and groupadd