Ingo Schommer 51cd0146df Merge branch '1.0'
Conflicts:
	.travis.yml
	code/model/Translatable.php
2013-06-03 12:06:29 +02:00
..
2012-10-02 22:50:44 +02:00
2013-06-03 12:06:29 +02:00