Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts: airtime_mvc/application/common/Database.php
2012-09-05 17:45:13 -04:00 · 2012-09-05 17:45:13 -04:00 · 0ae1b9fea6
parent 139950fac2 3894990975
commit 0ae1b9fea6
1 changed files with 3 additions and 1 deletions
--- a/airtime_mvc/application/common/Database.php
+++ b/airtime_mvc/application/common/Database.php
@ -1,5 +1,7 @@
 <?php
-class Application_Common_Database{
+class Application_Common_Database
+{
+
    public static function prepareAndExecute($sql, $paramValueMap, $type='all')
    {
        $con = Propel::getConnection();