Andreas Fischer a01e916737 Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header Conflicts: tests/mock/cache.php		2012-01-02 17:36:21 +01:00
..
parser_test.php	[ticket/10011] Tests can't be ran on PHP < 5.3	2011-01-31 14:02:30 +01:00
url_bbcode_test.php	Merge branch 'develop-olympus' into develop	2012-01-02 17:36:21 +01:00