tree 5cbe1bc632493d12cd7ad99383a45a689560c8b6
parent 63c34f2774440c5de77429cb613a4dda268f4dd9
parent dc29c6dc9069650d69496635643f00ab5e52067e
author Andrey Andreev <narf@devilix.net> 1436969700 +0300
committer Andrey Andreev <narf@devilix.net> 1436969700 +0300

Merge branch 'patch-1' of github.com:w0den/CodeIgniter into feature/output_cache