Thomas Müller 9e1016f7d2 Merge branch 'master' into fixing-4343-master ... Conflicts: lib/connector/sabre/quotaplugin.php		2013-08-22 17:59:39 +02:00
..
sabre	Merge branch 'master' into fixing-4343-master	2013-08-22 17:59:39 +02:00