Damian Mooyman 243caeb579 Merge remote-tracking branch 'origin/1.1'
# Conflicts:
#	.travis.yml
#	code/extensions/MultiFormObjectDecorator.php
#	code/model/MultiForm.php
#	composer.json
#	tests/MultiFormTest.php
2015-11-30 10:30:20 +13:00
..