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
..
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2012-01-02 17:36:21 +01:00
2012-01-02 16:20:30 +00:00
2011-05-04 00:07:58 -04:00
2012-01-02 17:36:21 +01:00
2012-01-02 16:20:30 +00:00
2012-01-02 17:36:21 +01:00
2012-01-02 17:36:21 +01:00
2012-01-02 17:36:21 +01:00
2012-01-02 17:36:21 +01:00
2012-01-02 17:36:21 +01:00
2011-09-04 11:05:30 +03:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2012-01-02 17:36:21 +01:00
2012-01-02 17:36:21 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2010-11-11 19:10:55 +01:00
2012-01-02 17:36:21 +01:00