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