Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

Conflicts: application/libraries/BigData.php
LimeSurvey · Mar 31, 2014 · 3006900 · 3006900
2 parents fe59363 + 6947824
commit 3006900
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/application/libraries/BigData.php b/application/libraries/BigData.php
@@ -231,6 +231,7 @@ protected static function xmlrpc_echo_stream($data)
         {
             $data->render();
         }
+
         protected static function xmlrpc_echo_string($data)
         {
             self::tag('string', "<![CDATA[$data]]>");