[mod_security_crs/el6: 2/2] Merge branch 'master' into el6

[Athmane Madjoudj]

commit 64eaf7833cde3575ab2648c6e34b205e7916f862
Merge: 4dea13b 72ab0ca
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date:   Sun Sep 16 17:45:14 2012 +0100

    Merge branch 'master' into el6

 .gitignore            |    1 +
 mod_security_crs.spec |   20 +++++++++++++++-----
 sources               |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---