Ingo Schommer 72a284c9b8 Merge remote-tracking branch 'origin/3'
Conflicts:
	core/Constants.php
	docs/en/05_Contributing/01_Code.md
	tests/model/SQLQueryTest.php
2015-04-09 16:26:16 +12:00
..
2015-03-04 08:43:00 -08:00
2015-03-04 08:43:00 -08:00
2015-03-04 08:43:00 -08:00
2014-11-26 22:49:37 +13:00
2013-03-20 00:46:32 +01:00
2014-08-19 09:17:15 +12:00
2013-10-30 16:11:11 +00:00