Adding width and height to list of clear variables to fix #1059
Updating change log relating to #1059.
Merge pull request #1389 from jamiefdhurst/2.1-stable

Adding width and height to list of clear variables to fix #1059
Fix issue #1387
Stop travis trying to run unit tests on 2.1-stable.
Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stable
Fix an erroneus method name
Driver_Library had $lib_name set as static, and used non-static
Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stable
Adding IPv6 support to the Input and Form_validation libraries.
Documenting IPv6 changes and adding update notes.
Fixed valid_ip() for PHP < 5.2
Revert a change
Fixed conflicts
Why were there conflicts merging into master?
Updating version number and release date for 2.1.1
Updated downloads page in docs to increment versions
Revert from() alias escaping fix - it was breaking more stuff
Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1
Switch strstr() arguments
Revert a preg_replace()