Fix a potential undefined variable error
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Added 'application/vnd.ms-office' MIME for ppt

An export from Apple's Numbers to .ppt gives a MIME of application/vnd.ms-office
Another ppt mime type
Removed errant newline
Seriously, remove the line ending
Merge pull request #3079 from seanfahey/develop

Added MIME types for .ppt uploads
Updating table template prototype id documentation

Updating template prototype in documentation to reflect the actual
template prototype in the table library.
Merge pull request #3082 from AdwinTrave/develop

Updating table template prototype in documentation
Fix #3085
Fix #3101
config load bug fix
style change
remove the empty line at the end of file
Merge pull request #3103 from dickfu/fix_config_load

config load bug fix
Make num_links=0 in pagination library possible to configure
Revert "Make num_links=0 in pagination library possible to configure"

This reverts commit a01924d2cc2d63d2bddbee85a18b423b88a9b19e.
Make 'num_links=0' configuration available in Pagination library

Changed conditions when making 'first' and 'last' links
Add a changelog entry in Pagination Library section
Fixed a changelog entry