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