merge upstream & update configs

This commit is contained in:
Mihai Pitu
2013-08-23 13:54:30 +03:00
parent 107ff9af8f
commit 9651da3d4c
192 changed files with 14497 additions and 439 deletions

2
NOTICE
View File

@@ -1,5 +1,5 @@
ModSecurity (www.modsecurity.org)
    Copyright [2004-2011] Trustwave Holdings, Inc
    Copyright [2004-2013] Trustwave Holdings, Inc
    This product includes software developed at
    Trustwave Holdings, Inc (http://www.trustwave.com/).