Merge pull request #15169 from rullzer/fix_displayNamesInGroup

author Morris Jobke <hey@morrisjobke.de>

Mon, 30 Mar 2015 15:04:09 +0000 (17:04 +0200)

committer Morris Jobke <hey@morrisjobke.de>

Mon, 30 Mar 2015 15:04:09 +0000 (17:04 +0200)
author Morris Jobke <hey@morrisjobke.de>
Mon, 30 Mar 2015 15:04:09 +0000 (17:04 +0200)
committer Morris Jobke <hey@morrisjobke.de>
Mon, 30 Mar 2015 15:04:09 +0000 (17:04 +0200)
diff --cc core/ajax/share.php
Simple merge
diff --cc lib/private/group/manager.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Mon, 30 Mar 2015 15:04:09 +0000 (17:04 +0200)
committer	Morris Jobke <hey@morrisjobke.de>
	Mon, 30 Mar 2015 15:04:09 +0000 (17:04 +0200)
		1	2
core/ajax/share.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/group/manager.php	patch \|	diff1 \|	diff2 \|	blob \| history