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