Fix line breaks in 3.2.0.sql
Merge branch 'upstream-master' into merge-upstream

Conflicts:
	administrator/components/com_admin/sql/updates/mysql/3.2.0.sql