^ updated ver. 3.2.1.1
Merge branch 'master' of github.com:joomlajp/Joomla-in-Japanese

Conflicts:
	installation/sql/mysql/sample_data_jp.sql