Simon Welsh d844c74e3c Merge branch '3.0' into 3.1
Conflicts:
	.travis.yml
	control/HTTP.php
	email/Mailer.php
	tests/control/HTTPTest.php
2013-07-05 10:17:14 +12:00
..
2013-07-05 10:17:14 +12:00
2012-11-06 11:01:48 +01:00
2013-05-17 00:45:52 +02:00