merge...
treecf0721c95893f960cdaef194efef82698a3e824e
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB
drwxr-xr-x - tests