EllisLab/CodeIgniter — pull request #2589 by vlakoff (2013-08-07 08:00:48+00:00)
Title: Fix a few more merge conflicts

@derekjones merge conflicts are still happening, but they're made easier to fix