Simon Welsh 0e0597f8cd Merge branch '3.0' into 3.1
Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php
2014-03-10 22:56:27 +13:00
..
2012-10-30 17:00:41 +01:00
2012-06-27 14:42:23 +12:00
2012-06-27 14:42:23 +12:00
2012-06-27 14:42:23 +12:00
2012-07-25 14:23:33 +12:00
2012-07-27 15:31:14 +12:00
2012-07-30 11:43:07 +12:00
2012-09-05 11:05:21 +12:00
2012-09-12 11:17:40 +02:00
2012-11-06 10:41:24 +13:00
2012-11-16 14:45:20 +13:00
2013-08-07 20:55:10 +02:00
2013-09-12 16:48:15 +02:00
2013-09-26 01:32:41 +02:00
2014-02-19 15:39:54 +13:00
2013-08-09 14:25:58 +12:00
2013-09-13 18:50:45 +02:00
2013-11-08 01:11:57 +01:00
2014-02-19 15:40:16 +13:00
2014-02-24 10:08:09 +13:00