API: Install framework 2.5 into the sapphire directory
Integrate composer in the Travis build process

Creates a package definition from the framework version being built,
and uses composer to install it into an installer project, as well
as the required modules for testing.
Adding docx extension

Adding docx extension so files of docx format can be attached by email
Merge pull request #1253 from willmorgan/patch-1

Adding docx extension
Merge pull request #1236 from ajshort/travis-composer-2.5

Travis Composer Integration (2.5.x)
BUG SQL Injection in CsvBulkLoader (fixes #6227)

Diff should speak for itself, looks like this will have to be implemented in all supported branches. 
Merge pull request #1308 from ss23/patch-10

BUG SQL Injection in CsvBulkLoader (fixes #6227)
Merge remote-tracking branch 'origin/2.4' into post-2.4
Including cms in post-2.4 builds for sapphire
Simplified travis builds (external setup scripts)
Require cms in 2.4 composer.json (which is used in travis)
Yet another resubmission of pull request #1779

Yet another resubmission of pull request #1779. Hopefully it will submit against the "post-2.4" branch as intended.
Merge pull request #1790 from hdrlab/patch-5

Yet another resubmission of pull request #1779
RSS feed description encoding fix

Stops the RSS feed's description from being double XML encoded. The double-encoding started happening after a change to TextField.php in commit 029f77f5a414ec806d89311690281398a4898285.
Less trademark-encumbered doc icons (fixed #1787)

Thanks to http://p.yusukekamiyamane.com/
Use the correct variable as the key into $record

It was using $fieldName, which is the CSV field name, not the database
field name. This prevents duplicate detection from working. It now
properly uses $SQL_fieldName
Merge pull request #1821 from oddnoc/csvbulkloader-findexisting-2.4

Use the correct variable as the key into $record
composer/installer dep workaround

Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
Fixing array to string conversion in dev/build for PHP 5.4
Fixing array to string conversion in dev/build for PHP 5.4