UPDATE 2013-06-03 [BY MAWIN~]
Merge branch 'master' of https://github.com/unisexx/ppt

Conflicts:
	application/config/database.php
D