up

up
Merge branch 'master' of https://github.com/linzhenlong/auto-xhprof

Conflicts:
	auto-xhprof.php