Removed use of assertCount() from this test as it causes infinite loops on Travis.
Merge pull request #2847 from sminnee/fix-travis-infinite-loop

Fix travis-specific infinite loop in 3.0
FIX Requirement documentation of MySQL driver

Currently the documentation states that the `mysql` module for PHP is required, however as of #84 (over 2 years ago) this is no longer the case and the required module is now `mysqli`.
Added 3.0.9-rc1 changelog
Removed SS-2014-002 from changelog, not backported to 3.0
Added changelog links
Silverstripe.com is not this version

On Silverstripe.com(http://doc.silverstripe.com/framework/en/3.0/topics/shortcodes) is an older version of this file.
From the "Built-in Shortcodes"-heading down to the bottom the page is marked as code.

Cheers
K
Added 3.0.9 changelog
Merge pull request #2886 from KarlKl/patch-1

Silverstripe.com is not this version
Rewrote usages of error suppression operator
Merge pull request #2924 from tractorcow/pulls/3.0-remove-error-suppression

Rewrote usages of error suppression operator (3.0 version)
Update composer.md
Merge pull request #2934 from timsnadden/patch-2

Update composer.md
Update nginx.md

Provides a nginx.conf that follows nginx good practices and duplicates the functionality of
the .htaccess files in framework, cms and installer.
Merge branch '3.0' into 3.1

Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php