DirtyCommit
Merge branch 'master' of github.com:Stolz/CodeIgniter

Conflicts:
	user_guide/changelog.html
	user_guide/installation/downloads.html
	user_guide/installation/upgrade_214.html