Bug 993391 - Places async transactions: Implement "move bookmarks" command. r=mak.
Bug 988314 - Inspector test clean-up - Moved browser_inspector_changes.js to styleinspector; r=jwalker
Bug 999080 - preprocess extensions.css, r=jaws
Backed out changeset 1adbd1657ba1
Merge m-c to fx-team
Bug 993162 - Make default indent size 2 spaces. r=jwalker
Bug 997996 - Make ToolbarComponent.dismissEditingMode use the cancel editing mode button. r=mcomella
Bug 988569 - Some fine tuning to suggestions showing logic. r=harth
Bug 611556 - Add persistent zoom history sessions. r=roc, r=snorp
Bug 994195 - Add tests for RawResource (r=margaret)
Bug 992995 - Implement the plugin whitelist for the following plugins/bugs. r=gfritzsche
* bug 979849 - Unity
* bug 980133 - Cisco Jabber SDK
* bug 980772 - McAfee Security Scanner
* bug 981403 - Cisco VGConnect for directv.com
* bug 981905 - Cisco Jabber Guest
* bug 982045 - Estonian ID card
* bug 984441 - coupons.com
* bug 987056 - Nexus Personal BankID
* bug 988119 - gradecam
* bug 988781 - Smart Card Plugin
* bug 989096 - Cisco WebEx
* bug 990067 - Skype
* bug 990068 - Facebook video calling
* bug 990069 - MS Office Lync plugin
* bug 990286 - VidyoWeb plugin
Bug 989767 - When the tabbar is hidden (popup), the top border of the location bar is gone. r=dao
Bug 998481 - Checked items in subview panels have checkmarks on the wrong side in RTL locales. r=jaws, feedback=mikedeboer.
Bug 993712 - Try to fix permanent orange in browser_984455_bookmarks_items_reparenting.js by making sure test for 968447 fully closes its window. r=jaws.
Bug 999398 - Rename RawResource.get() to RawResource.getAsString() (r=nalexander)
Bug 999281 - Adds be, es-MX, id, and ms to mobile/android/locales/maemo-locales. r=mfinkle
Backed out changeset 1c88a6ab7034 (bug 999281) DONTBUILD
Merge fx-team to m-c.