Merge branch 'master' into 'master'

Marius Cramer

2015-03-01 e2e00df25e5561131b5b50d332f0de712b4244c7

1
2
3
/^\s*(LoadModule|LoadFile|Include)(\s+|[\\\\])/mi
/^\s*(SuexecUserGroup|suPHP_UserGroup|suPHP_PHPPath|suPHP_ConfigPath)(\s+|[\\\\])/mi
/^\s*(FCGIWrapper|FastCgiExternalServer)(\s+|[\\\\])/mi