tree 3341a3b19020cf97af8b4e3a8f1ef108e3912e31
parent 5d4da1bae6f00a193db06e940cd59ebf9743b615
parent 319cf4d4d9897a929d6d58ad1a29bcc4a85a0b42
author Eric Barnes <eric@ericlbarnes.com> 1323140738 -0500
committer Eric Barnes <eric@ericlbarnes.com> 1323140738 -0500

Merge branch 'develop' of https://github.com/michaeljdennis/CodeIgniter into michaeljdennis-develop

Conflicts:
	system/libraries/Image_lib.php
	user_guide/changelog.html