Linuturk/webpagetest — pull request #50 by hdansou (2014-09-03 17:53:44+00:00)
Title: Added the php.ini and httpd.conf

fix few merge conflicts as well.