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