From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 30 Sep 2013 14:27:00 +0000 (+0200)
Subject: Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
X-Git-Tag: v6.0.0alpha2~93^2~3^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4e9a95f3e9fcf3336019de1e1e4963ed91206065;p=nextcloud-server.git

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

Conflicts:
	lib/appframework/http/request.php
	tests/lib/appframework/http/RequestTest.php
---

4e9a95f3e9fcf3336019de1e1e4963ed91206065