Merge branch '2.1' into 2.2

Conflicts:
	lib/Cake/VERSION.txt
This commit is contained in:
mark_story 2012-05-26 21:11:36 -04:00
commit 4b8c469004
5 changed files with 22 additions and 3 deletions

View file

@ -615,7 +615,7 @@ class CakeRequest implements ArrayAccess {
/**
* Get the host that the request was handled on.
*
* @return void
* @return string
*/
public function host() {
return env('HTTP_HOST');