Merge branch '3.2.x'

Conflicts:
	phpBB/language/en/install.php
This commit is contained in:
Marc Alexander 2016-06-19 18:57:52 +02:00
commit f9a38cafb2

Diff content is not available