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