Marc Alexander 7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords ...

Conflicts:
	phpBB/includes/functions.php

2013-10-03 10:04:59 +02:00

..

v30x

[ticket/11700] Fix a few more comments

2013-09-16 04:45:58 +02:00

v310

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords

2013-10-03 10:04:59 +02:00