[perl-NTLM/el4: 4/4] Merge branch 'master' into el4

[Nick Bebout]

commit 91196fd1235c28befda32321bc52594dc84e166d
Merge: 33e1103 7f80961
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 8 21:26:40 2011 -0500

    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	perl-NTLM.spec
    	sources

 .gitignore     |    1 +
 perl-NTLM.spec |    8 +++++++-
 sources        |    4 ++++
 3 files changed, 12 insertions(+), 1 deletions(-)
---
diff --cc sources
index 8d49a25,8ab9c7f..ab47fd8
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +c6172ad1fbaf87c1dfb604d36f22b1f0  NTLM-1.08.tar.gz
++=======
+ da314ee94b14af2a2f39b6f2c0046e73  NTLM-1.09.tar.gz
++>>>>>>> master