The cycle repeats.
Merge branch 'master' of github.com:fruux/sabre-dav

Conflicts:
	ChangeLog.md
	lib/DAV/Version.php