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