Merge pull request #4892 from owncloud/vcategories_public

author Thomas Müller <thomas.mueller@tmit.eu>

Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)

committer Thomas Müller <thomas.mueller@tmit.eu>

Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)
author Thomas Müller <thomas.mueller@tmit.eu>
Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)
committer Thomas Müller <thomas.mueller@tmit.eu>
Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)
diff --cc lib/public/iservercontainer.php
Simple merge
diff --cc lib/server.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)
		1	2
lib/public/iservercontainer.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/server.php	patch \|	diff1 \|	diff2 \|	blob \| history