Merge pull request #20650 from owncloud/systemtags-core

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

Mon, 30 Nov 2015 14:38:43 +0000 (15:38 +0100)

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

Mon, 30 Nov 2015 14:38:43 +0000 (15:38 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Nov 2015 14:38:43 +0000 (15:38 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Nov 2015 14:38:43 +0000 (15:38 +0100)
diff --cc db_structure.xml
Simple merge
diff --cc lib/private/server.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 30 Nov 2015 14:38:43 +0000 (15:38 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 30 Nov 2015 14:38:43 +0000 (15:38 +0100)
		1	2
db_structure.xml	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/server.php	patch \|	diff1 \|	diff2 \|	blob \| history