make squid and apache format more flexible
Merge branch 'master' of https://github.com/ezpaarse-project/ezpaarse