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:
commit
4e9a95f3e9
Conflicts: lib/appframework/http/request.php tests/lib/appframework/http/RequestTest.php