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

* develop-olympus:
  [ticket/10011] Tests don't work on PHP < 5.3

Conflicts:
	tests/security/redirect_test.php

2011-01-31 13:26:20 +01:00

..

base.php

[task/phpunit-xml] Use phpunit.xml for test suite

2011-01-04 22:54:01 +01:00

extract_current_page_test.php

[ticket/10011] Tests don't work on PHP < 5.3

2011-01-31 12:58:18 +01:00

redirect_test.php

Merge branch 'develop-olympus' into develop

2011-01-31 13:26:20 +01:00