Andreas Fischer b809bea3d4 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10549] using correct variable in includes/functions_module.php too
  [ticket/10549] changed "right" to "incorrect"

Conflicts:
	phpBB/includes/functions_module.php

2014-03-12 16:28:47 +01:00

..

en

Merge branch 'develop-olympus' into develop

2014-03-12 16:28:47 +01:00

index.htm

…