Fixed bad merge in CHANGES.
Fixed bad merge in CHANGES.


sdgdsffdsfff/ModSecurity,wafbuild/ModSecurity,hbopuri/ModSecurity,beikezcs/ModSecurity,csanders-git/ModSecurity,csanders-git/ModSecurity,wafbuild/ModSecurity,daniilyar/ModSecurity,rosmo/ModSecurity,phpModSecurity/ModSecurity,defanator/ModSecurity,rosmo/ModSecurity,hbopuri/ModSecurity,p0pr0ck5/ModSecurity,sdgdsffdsfff/ModSecurity,beikezcs/ModSecurity,beikezcs/ModSecurity,sdgdsffdsfff/ModSecurity,rosmo/ModSecurity,marcstern/ModSecurity,SpiderLabs/ModSecurity,bjh7242/ModSecurity,sdgdsffdsfff/ModSecurity,sdgdsffdsfff/ModSecurity,p0pr0ck5/ModSecurity,p0pr0ck5/ModSecurity,irtnog/ModSecurity,irtnog/ModSecurity,SpiderLabs/ModSecurity,csanders-git/ModSecurity,swebru/ModSecurity,sdgdsffdsfff/ModSecurity,csanders-git/ModSecurity,defanator/ModSecurity,wafbuild/ModSecurity,bjh7242/ModSecurity,marcstern/ModSecurity,swebru/ModSecurity,daniilyar/ModSecurity,marcstern/ModSecurity,bjh7242/ModSecurity,rosmo/ModSecurity,beikezcs/ModSecurity,bjh7242/ModSecurity,bjh7242/ModSecurity,csanders-git/ModSecurity,hbopuri/ModSecurity,hbopuri/ModSecurity,SpiderLabs/ModSecurity,irtnog/ModSecurity,hbopuri/ModSecurity,swebru/ModSecurity,swebru/ModSecurity,irtnog/ModSecurity,hbopuri/ModSecurity,daniilyar/ModSecurity,swebru/ModSecurity,daniilyar/ModSecurity,csanders-git/ModSecurity,irtnog/ModSecurity,p0pr0ck5/ModSecurity,swebru/ModSecurity,irtnog/ModSecurity,bjh7242/ModSecurity,p0pr0ck5/ModSecurity,marcstern/ModSecurity,beikezcs/ModSecurity,beikezcs/ModSecurity,defanator/ModSecurity,daniilyar/ModSecurity,daniilyar/ModSecurity,p0pr0ck5/ModSecurity,marcstern/ModSecurity