Bug 862398 - Maintain the order of tools in the tab and the options panel list, r=past
bug 867450 - Type in JSTerm.prototype._fetVarProperties; r=msucan
Bug 865680 - Remove the last of the two devtools.gcli.allowSet lines; r=mratcliffe
Bug 860571 - Pings for Firefox OS r=ferjm
Merge m-c to birch.
Bug 860836 - Fix error importing contacts from SIM card. r=bent
Bug 868120 - B2G MMS: Add 'mms.debugging.enabled' pref for MMS debug messages to make sure whether message is sent by SMS or MMS. r=vyang
Bug 860660 - Content process support for display of PIN/PUK retry count. r=vyang
Bug 869206 - Make webrtc code build on gonk-JB, r=jesup
Bug 868530 - Unique window identifier for identity on b2g device. r=jst
Bug 860660 (follow-up): update interface uuid. r=me
Bug 776212 - Get usb rndis interface's name automatically r=dhylands
Bug 795978 - Error: this._containers is undefined in MarkupView.jsm Line: 327; r=mratcliffe
Bug 832231 - After a reload, breakpoints require multiple resumes to allow execution to continue; r=vporof
Bug 795978 - Backout - Error: this._containers is undefined in MarkupView.jsm Line: 327; r=orange
bug 808369 - Use VariablesView in the Scratchpad; r=msucan
bug 679364 - Use content/browser/devtools/* for aliases; r=rcampbell
Bug 740541 - Style sheets in iframes are not listed in the style editor; r=harth
merge m-c to fx-team
Remove the unused AudioEventTimeline::ComputedValue function, no bug