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
Merge fx-team to m-c a=merge CLOSED TREE