Joas Schilling 2a662c5e07 Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/phpbb/user.php

2015-06-14 17:40:18 +02:00

..

code_sniffer

…

webpi

…

build_announcement.php

…

build_changelog.php

…

build_helper.php

…

build.xml

…

compare.sh

…

package.php

…

sami-all.conf.php

…

sami-checkout.conf.php

…