[mod_security_crs/el5: 3/3] Merge branch 'master' into el5

[Athmane Madjoudj]

commit b979593f8843c018b3572f013e3bc515d18c8bcf
Merge: da24660 62e63a3
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date:   Thu Sep 13 11:02:06 2012 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	mod_security_crs.spec

 mod_security_crs.spec |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)
---