Merge pull request #4497 from owncloud/newlines_at_eof_kondou

author Kondou <kondou@ts.unde.re>

Sun, 18 Aug 2013 14:16:15 +0000 (07:16 -0700)

committer Kondou <kondou@ts.unde.re>

Sun, 18 Aug 2013 14:16:15 +0000 (07:16 -0700)
author Kondou <kondou@ts.unde.re>
Sun, 18 Aug 2013 14:16:15 +0000 (07:16 -0700)
committer Kondou <kondou@ts.unde.re>
Sun, 18 Aug 2013 14:16:15 +0000 (07:16 -0700)
diff --cc apps/user_ldap/css/settings.css
Simple merge
diff --cc apps/user_ldap/js/settings.js
Simple merge
author	Kondou <kondou@ts.unde.re>
	Sun, 18 Aug 2013 14:16:15 +0000 (07:16 -0700)
committer	Kondou <kondou@ts.unde.re>
	Sun, 18 Aug 2013 14:16:15 +0000 (07:16 -0700)
		1	2
apps/user_ldap/css/settings.css	patch \|	diff1 \|	diff2 \|	blob \| history
apps/user_ldap/js/settings.js	patch \|	diff1 \|	diff2 \|	blob \| history