qcubed/framework — pull request #297 by vaibhav-kaushal (2013-09-25 09:12:32+00:00)
Title: Updated the rbranch

Updated the changes in configuration.inc.php.sample and removed the merge conflict message from tavis/configuration.inc.php which was causing travis tests to fail.