Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request

Conflicts:
	lib/appframework/http/request.php
	tests/lib/appframework/http/RequestTest.php
This commit is contained in:
Thomas Tanghus 2013-09-30 16:27:00 +02:00
commit 4e9a95f3e9

Diff content is not available