Merge pull request #733 from narfbg/2.1-stable-upload-hotfix

Hotfix for a bug in the Upload library
tree: c6bff5442978a46f81431a41ee1e97e08e716646
  1. .gitignore
  2. application/
  3. index.php
  4. license.txt
  5. system/
  6. user_guide/