3 Commits

Author	SHA1	Message	Date
Thomas Müller	5e397d89c4	Merge branch 'master' into fixing-4546-master ... Conflicts: lib/private/connector/sabre/directory.php	2013-10-07 17:47:54 +02:00
Thomas Müller	aebc330f26	Merge branch 'master' into fixing-4011-master	2013-10-04 14:06:42 +02:00
Thomas Müller	9c9dc276b7	move the private namespace OC into lib/private - OCP will stay in lib/public ... Conflicts: lib/private/vcategories.php	2013-09-30 16:36:59 +02:00