Merge branch '2.2.x' into 2.2.x-saas

Conflicts: airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00 · 2012-11-28 16:10:33 -05:00 · 4983721565
commit 4983721565
parent d8165cbf44 7249e36081
27 changed files with 385 additions and 246 deletions
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@ -107,7 +107,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
    public function isValid($data)
    {
        $isValid = parent::isValid($data);
-
        return $isValid;
    }