Automated merge with http://hg.ellislab.com/CodeIgniter2
tree: de0fd7eae5c863cbca77507817331dbf767dd9d3
  1. .hgignore
  2. index.php
  3. license.txt
  4. system/
  5. user_guide/