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