Igor Wiedler 14a84cf89c Merge branch 'develop-olympus' into develop ...

This commit also ports all ascraeus tests to the new format.

Conflicts:
	tests/all_tests.php
	tests/network/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/template/templates/includephp.html

2011-01-07 01:39:59 +01:00

..

parser_test.php

Merge branch 'develop-olympus' into develop

2011-01-07 01:39:59 +01:00