tree a59af74d4084620ab360a26a403eb2a7495364d2
parent 820f06f63de3da890a87a88161daea0fd1be8caa
parent c79a62c5c43c75a3dbc0af77433694340b235047
author ftwbzhao <b.zhao1@gmail.com> 1436172474 +0800
committer ftwbzhao <b.zhao1@gmail.com> 1436172474 +0800

Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop

Conflicts:
	user_guide_src/source/changelog.rst