Ingo Schommer 795d3e4b3b Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	dev/install/install.php5
	docs/en/index.md
	tests/core/CoreTest.php
2013-10-07 16:18:20 +02:00
..
2013-08-30 10:47:11 +12:00
2013-09-18 14:32:38 +02:00
2013-08-25 10:59:26 +12:00
2013-05-06 12:51:46 +12:00
2013-07-19 14:18:49 +12:00
2013-09-05 12:54:31 +02:00