Merge revisions:
treeeeed66fe2ff92a246d498defd1863996737e4d59
drwxr-xr-x - code_sniffer
drwxr-xr-x - phpBB
drwxr-xr-x - tests