tree d9888e656906bc675ad86748605d9d693b7267a0
parent bc204813956771e83d10c3b04e22bb5874938a99
parent 9001a882424aaf4edc67552d3beecb9283fa1bdd
author Eric Barnes <eric@ericlbarnes.com> 1322420947 -0500
committer Eric Barnes <eric@ericlbarnes.com> 1322420947 -0500

Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into has2k1-patch-1

Conflicts:
	user_guide_src/source/changelog.rst