qcubed/framework — pull request #298 by vaibhav-kaushal (2013-09-25 09:36:27+00:00)
Title: Vaibhav kaushal feature multi templates

Updated everything on my end to send a clean pull request. Removed the lines in travis/configuration.inc.php created by previous merge conflict to new values.