Merge pull request #4262 from owncloud/fix_jslint_kondou

author Christopher <kondou@ts.unde.re>

Tue, 20 Aug 2013 19:45:10 +0000 (12:45 -0700)

committer Christopher <kondou@ts.unde.re>

Tue, 20 Aug 2013 19:45:10 +0000 (12:45 -0700)
author Christopher <kondou@ts.unde.re>
Tue, 20 Aug 2013 19:45:10 +0000 (12:45 -0700)
committer Christopher <kondou@ts.unde.re>
Tue, 20 Aug 2013 19:45:10 +0000 (12:45 -0700)
diff --cc apps/user_ldap/js/settings.js
Simple merge
diff --cc settings/js/personal.js
Simple merge
diff --cc settings/js/users.js
Simple merge
author	Christopher <kondou@ts.unde.re>
	Tue, 20 Aug 2013 19:45:10 +0000 (12:45 -0700)
committer	Christopher <kondou@ts.unde.re>
	Tue, 20 Aug 2013 19:45:10 +0000 (12:45 -0700)
		1	2
apps/user_ldap/js/settings.js	patch \|	diff1 \|	diff2 \|	blob \| history
settings/js/personal.js	patch \|	diff1 \|	diff2 \|	blob \| history
settings/js/users.js	patch \|	diff1 \|	diff2 \|	blob \| history