Bug 1084321 - Remove b2g app meta viewport work-around. r=kats
Bug 1042135 - Change three-state DNT back to two state and update text.  (r=dolske,jst,mcmanus)

--HG--
extra : rebase_source : 52556477cba80e87651ce7c84a531a2de500d21a
Merge m-c to inbound. a=merge
Bug 1083584, Support caching patches in funsize (partial update service), r=rstrong  DONTBUILD

--HG--
extra : amend_source : fd2eef1a27cbdcdb777f34a41879bdf6c47f7815
Bug 737967 - Add simple platform GPU Profiling based on GL_TIME_ELAPSED_EXT. r=ehsan,jgilbert
Bug 1068360 - [e10s] Fix mixed content doorhanger and enable its test under e10s. r=Mossop,mmc
Merge m-c to fx-team. a=merge
Bug 1042135 - Change three-state DNT back to two state and update text in Fennec. (r=liuche)
* * *
Bug 1042135 - Update robocop tests
Bug 1087310 - Watch for objects that have been swapped when marking store buffer slot edges, r=terrence.
Bug 1074961 - Part 5: use ChunkPool to manage the available chunk sets; r=sfink,r=jonco

--HG--
extra : rebase_source : 60c9cca467fcee9cd8b2ef666ff1d863003b0ad3
Bug 1074961 - Part 6: remove GCChunkSet; r=sfink

--HG--
extra : rebase_source : fc4076808c7d02956e298d5942f570ef91ca772d
Bug 1074010 - Update cubeb from upstream.  r=padenot

--HG--
rename : media/libcubeb/README => media/libcubeb/README.md
Bug 1085223 - Add an occlusion culling pass to compositor layers. r=BenWa

--HG--
extra : rebase_source : fc5e7007477a8d999fdd1380bf81dd4c205099df
Bug 1072817 - Minor adjustments (primarily for method-ordering) as a followup to making accessing the [[Prototype]] of a revoked proxy not crash.  Also add another test.  r=trivial

--HG--
extra : rebase_source : 4bc4c0b872a5ef2b8a4ae563b2ff44a246a838e3
Bug 1052139 - Implement the ability to prevent modifying an extensible object's [[Prototype]].  r=efaust, r=bholley

--HG--
extra : rebase_source : 547490455fc588e40dd2b2dba4c3355768d78f8d
Bug 1085566 - Make the preventExtensions hook return succeeded/failed rather than always indicate failure by reporting an error.  r=efaust

--HG--
extra : rebase_source : 487b569d23ce18f39fc53697e5f25cc789885803
Bug 1052139 - Reorder the preventExtensions trap just after the [[Prototype]]-access traps.  r=code-motion

--HG--
extra : rebase_source : ea85bf1daa26ec7a32caf2656ebf99c6e2757cfa
Bug 1085680 - OdinMonkey: change argument type of Math.min/max from 'int' to 'signed' (r=bbouvier)

--HG--
extra : rebase_source : c40fcd056b6e5cc3eb16ea1486c99e3186706d4b
Bug 1085680 - OdinMonkey: remove MathRetType (r=bbouvier)

--HG--
extra : rebase_source : 755aa9b665c82ecba3de8be8722c5f543b88ef42
Bug 1085680 - OdinMonkey: change return type of Math.clz32 to fixnum (r=bbouvier)

--HG--
extra : rebase_source : 105e21029b6b1f6eabd23b78fe2caea3ec21bcb7