Daniel Hensby 0b36082564 Merge branch '3'
Conflicts:
	.travis.yml
	composer.json
	docs/en/changelogs/4.0.0.md
	forms/gridfield/GridFieldExportButton.php
2015-08-17 13:12:41 +01:00
..
2015-07-20 10:48:01 +01:00
2015-08-17 13:12:41 +01:00
2015-06-23 11:57:54 +12:00
2015-08-04 10:39:12 +12:00
2015-08-04 10:29:40 +12:00
2015-02-13 00:48:05 +13:00