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
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 1042135 - Update Directory Links Provider to use only the dnt.enabled pref after removing the dnt.value pref. (r=adw)

--HG--
extra : rebase_source : cc511558eb39099bc745116798ca64829de79d0d
Bug 1087410: Ensure that ChromeHang annotations don't break in e10s; r=jimm
Backed out changeset 27624d9e8f27 (bug 1084321) for B2G reftest orange.
Backout fa9c6845338e (bug 1085223) for causing bug 1087257.
Bug 1081072, part 2: add reftest.
Bug 1084500 part 1: Refactor ComputeBackgroundAnchorPoint to take a Position & use a per-component helper method. r=seth
Bug 1084500 part 2: Promote & rename ComputeBackgroundAnchorPoint to nsImageRenderer::ComputeObjectAnchorPoint. r=seth
Bug 1084500 part 3: Make documentation for ComputeObjectAnchorPoint cover non-background use cases. r=seth
Bug 1087496 - Optimize codegen for IsNullOrLikeUndefined* instructions. r=h4writer

--HG--
extra : rebase_source : 4699073583913d1d471ba7f72487dac305d0eb0b
Bug 1086612 - CSP: Let source expression be the empty set in case no valid source can be parsed (r=sstamm)
Bug 1086612 - CSP: Let source expression be the empty set in case no valid source can be parsed - tests (r=sstamm)
Bug 1086612 - CSP: Let source expression be the empty set in case no valid source can be parsed - update parser tests (r=sstamm)
Bug 1042823 - Don't blindly make MMinMax optimize for doubles, r=jandem,sunfish
No bug, Automated HSTS preload list update from host bld-linux64-spot-1094 - a=hsts-update
No bug, Automated HPKP preload list update from host bld-linux64-spot-1094 - a=hpkp-update