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

[Athmane Madjoudj]

commit 1e0ccb84847087c1795cc54d2508bcce3474d182
Merge: a4d0253 cef50fc
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date:   Wed Apr 3 15:30:48 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore           |    6 ++----
 10-mod_security.conf |    5 +++++
 mod_security.conf    |    3 ---
 mod_security.spec    |   41 +++++++++++++++++++++++++++++++----------
 sources              |    2 +-
 5 files changed, 39 insertions(+), 18 deletions(-)
---