Bug 946021 - Enable ARM assembly for Opus. r=ted,derf
Bug 998779 - Remove unused include of nsHashtable.h in nsMenuGroupOwnerX.mm. r=froydnj
Bug 984125 - Convert nsStringBundleService::mBundleMap to nsDataHashtable. r=ehsan
Bug 992415 - Fix null checks in FilePickerParent::Done. r=jdm
Merge m-c to inbound.
Bug 998396: Fix gethash completions, urlclassifier.malware_table and urlclassifier.phish_table may be comma-separated lists (r=gcp)
Bug 907770 - Part 1: Making ssltunnel run for android and b2g mochitests. r=jmaher
Bug 907770 - Part 2: Test changes for https support on b2g/android. r=jmaher
Bug 994413 - Make Gecko use the same value marking semantics as SpiderMonkey; r=jonco,mccr8
Bug 982698 - Make FilterNodeD2D1 support DataSourceSurface input surfaces. r=Bas
Bug 996929 - Make nsLayoutUtils::SurfaceFromElement optimize the returned surface upfront so that it doesn't have to be converted every time it's used. r=jwatt
Bug 996901 - Remove lots of gfxASurface.h and gfxImageSurface.h includes and forward declarations that are no longer needed. r=mattwoodrow
Bug 950372 follow-up - Avoid having the preprocessor define for READ in linux/fs.h break Moz2D's 2D.h by making sure 2D.h is included before whatever includes linux/fs.h. r=B2G KK Emulator Opt/Debug bustage
Bug 996564 - Mar command line help is wrong and fix libmar warning. r=spohl
Bug 996901 follow-up - Fix OS X 10.8 non-unified build bustage. r=bustage
Bug 996438 - Import BookmarkJSONUtils.jsm lazily into PlacesBackups.jsm. r=mak.

--HG--
extra : rebase_source : 244d30f479ddf9d79dfe216bd9024ba7f45c662a
Bug 966630 - Clamp level to TexImage operations to [0..31]. r=jgilbert

--HG--
extra : rebase_source : 90ba0687cffd63a361f655b89bab077713a8a312
Bug 996955 - Remove nsIDOMTouch; r=bzbarsky
Bug 996378 - Use Moz2D for gfxCallbackDrawable. r=roc
Bug 991177: Disallow overrides for SEC_ERROR_CA_CERT_INVALID (r=keeler)