Merge branch 'master' of https://github.com/evert/SabreDAV

Conflicts:
	lib/Sabre/DAV/Client.php
	tests/Sabre/DAV/ClientTest.php