Bug 628785 - Firefox should define a value for extensions.getAddons.recommended.url so AddonRepoistory.retrieveRecommendedAddons() works. r=Unfocused
Bug 860101 - payload._navPayload is a Window in 'will-navigate' event handler; r=harth
Bug 851546 - Options panel for DevTools Toolbox, r=jwalker
Backed out changeset 371ecfa8df92 (bug 851546) for breakage
Bug 851231 - Output Console.jsm API calls to the browser console; r=jwalker
Bug 861852 - Telemetry data from the remote protocol always appear in the remote buckets; r=rcampbell
Bug 772119 - expose source mapped sources over the remote debugging protocol; r=past
Bug 849069 - relative source map URLs should be resolved according to the spec's rules; r=past
Bug 862247 - Fix Contacts/Settings tests not running individually. r=gwagner

--HG--
extra : rebase_source : c9048a4680383576f329c4dcfb139a8e05633076
Merge m-c to birch.
Bug 861896 - [b2g-ril] Call waiting feature is not working on Geeksphone Peak devices. r=vicamo
Bug 862050 : When mms apn is the same as default apn, the cellphone can't get data call connection. r=vyang
Bug 860604 - Use receiving time to store received sms message. r=vicamo
Bug 853632 - Cache own and containing apps in TabContext. r=jlebar
Bug 860760 - Pause OMX media sources when playback is paused. r=sotaro, r=cdouble

OMXCodec needs to now when the stream is paused. Otherwise it will
prevent the device from lowering its power state when idle.
merge m-c to fx-team
Merge the last green birch changeset to m-c.
Merge m-c to inbound.
Bug 854085. Make thread asserts conditional on DEBUG not MOZ_DEBUG. r=jesup