Bug 866484 - [WiFi] Use shared code for settings
Bug 872608 - Turn unresponsive script dialog off when DEBUG=1 is true r=julienw
Bug 872922 - Localize dates/times on event view page r=lightsofapollo
Bug 870683 - Handle SCO
Merge pull request #9791 from masap/20130515_2

Bug 866484 - [WiFi] Use shared code for settings (r=fcampo, arthurcc)
Merge pull request #9756 from crh0716/870683

Bug 870683 - Handle SCO r=etienne, evelyn. a=tef+
Bug 873085 - [MMS] Checks for DOM API are too permissive r=gnarf37
Bug 872218 - [System] TypeError: callback is not a function app://system.gaiamobile.org/js/window_manager.js. r=rwaldron
Bug 872552 - Status bar date stay on the statusbar. r=timdream
Bug 872588 - Make mozSettings works again with the browser-helper extension. r=ochameau
Bug 872581 - Browser window is resize with the browser-helper extension. r=ochameau
Bug 866036 - [Buri][Audio]Can't adjust game volume. (Poppit) r=alive
Merge pull request #9808 from KevinGrandon/calendar_event_view_formatting

Bug 872922 - Localize dates/times on event view page r=lightsofapollo
Merge pull request #9795 from lightsofapollo/turn-unresponsive-scripts-off-in-debug

Bug 872608 - Turn unresponsive script dialog off when DEBUG=1 is true r=...
Bug 871425 - [Dialer] Truncate long carrier name with ellipsis when on call. r=etienne
Merge pull request #9803 from mcirlanaru/bug_871425

Bug 871425 - [Dialer] Truncate long carrier name with ellipsis when ... r=@etiennesegonzac
Merge remote-tracking branch 'upstream/master' into hidden-wifi-new
merge conflict resolved