Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11544] Add admin_login() method to 3.0 functional test case

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
This commit is contained in:
Andreas Fischer 2013-05-17 01:31:41 +02:00
commit d969203158

Diff content is not available