tree 8e8ca4b8383e2481b0a689fd07fc230013531822
parent 6581cac4d2b5fef69478ce1a5c3464200bfcbba5
parent c78e56a7df140ee777ffc67687877f3e70c77e28
author Anton Lindqvist <anton@qvister.se> 1339142987 +0200
committer Anton Lindqvist <anton@qvister.se> 1339142987 +0200

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

Conflicts:
	system/libraries/Cache/Cache.php