Merging from default

changeset:   3896:b693ae365bfa
tag:         tip
parent:      3894:f443fb123c72
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Apr 20 06:23:01 2015 -0400
summary:     Bug 1146426 - Add support for funsize in desktop_l10n.py. r=mgerva

--HG--
branch : production

scripts/desktop_l10n.py

@@ -1286,7 +1286,7 @@ def funsize_props(self):
             'platform': self.config['platform'],
         }
         self.info('funsize info: %s' % funsize_info)
-        self.set_buildbot_property('funsize_info', funsize_info,
+        self.set_buildbot_property('funsize_info', json.dumps(funsize_info),
                                    write_to_file=True)
 
 # main {{{