[mod_security/el6: 29/29] Merge branch 'master' into el6

[Athmane Madjoudj]

commit a4d02532a4bc5f91a73099eb1316433d81ae0f2f
Merge: 516bd4b b4feb28
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date:   Thu Nov 15 10:56:34 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	mod_security.conf
    	mod_security.spec
    	sources

 .gitignore                                 |    9 ++
 mod_security-fix-build-with-libxml29.patch |   82 +++++++++++++++++
 mod_security.conf                          |  135 ++++++++++-----------------
 mod_security.spec                          |   35 +++++++-
 sources                                    |    2 +-
 5 files changed, 173 insertions(+), 90 deletions(-)
---
diff --cc .gitignore
index fff59c7,1eab4d5..013117a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,7 +1,11 @@@
  modsecurity-apache_2.5.12.tar.gz
++<<<<<<< HEAD
 +/modsecurity-apache_2.6.7.tar.gz
++=======
+ /modsecurity-apache_2.5.13.tar.gz
+ /modsecurity-apache_2.6.5.tar.gz
+ /modsecurity-apache_2.6.6.tar.gz
+ /modsecurity-apache_2.6.8.tar.gz
+ /modsecurity-apache_2.7.0.tar.gz
+ /modsecurity-apache_2.7.1.tar.gz
++>>>>>>> master