tree c632591c646927c4c60ace51da68abd9134a33a2
parent 3b376595183e0e0db5559ccbfc368c442408dca9
parent 37b1d9ba5bef4594aaf458e0406599bdf33deb46
author Eric Barnes <eric@ericlbarnes.com> 1325730356 -0500
committer Eric Barnes <eric@ericlbarnes.com> 1325730356 -0500

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

Conflicts:
	user_guide_src/source/changelog.rst