phpbb/phpbb3 — pull request #1093 by p (2012-11-15 22:46:40+00:00)
Title: [ticket/11205] Fix merge conflict in readme.html.

http://tracker.phpbb.com/browse/PHPBB3-11205