@ yafpns
Merge branch 'master' of https://github.com/zmrnet/yafphp

Conflicts:
	yafphp/request/Yaf_Request_Http.php