[ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2

* ticket/13234:
  [ticket/13234] Fix conditions and CS

Conflicts:
	phpBB/phpbb/session.php

PHPBB3-13234
This commit is contained in:
Tristan Darricau 2014-10-28 12:25:53 +01:00
commit 9036edd935

Diff content is not available