Ingo Schommer a86e4ee00c Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	tests/injector/InjectorTest.php
	tests/travis/before_script
2013-02-18 14:15:42 +01:00
..
2012-06-20 23:59:16 +02:00
2012-06-20 23:59:16 +02:00