A little closer but not quite...
Merge branch 'master' of github.com:phpbbireland/phpbb3-extension-portal

Conflicts:
	ext/phpbbireland/portal/migrations/v10x/release_1_0_0.php