Simon Welsh c14d58f585 Merge branch '3.1'
Conflicts:
	.travis.yml
	model/ManyManyList.php
	model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
..
2014-07-16 21:24:02 +10:00
2014-07-16 21:24:02 +10:00
2014-05-22 18:34:15 +12:00
2014-07-16 21:24:02 +10:00