Merge m-c to mozilla-inbound
commit6ffd4fc09b605528812a13ea78ef92055bd6d693
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 14 Oct 2015 10:47:31 +0000 (14 12:47 +0200)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 14 Oct 2015 10:47:31 +0000 (14 12:47 +0200)
treeae5f16f9a84d4ab6929898ac00ec172f228d5ffd
parentd3a0b9cc9d243778f9fdb18324b24b9daec50cb1
parent0ecf7648674916331e8e7941368c8e0fddf8a5f4
Merge m-c to mozilla-inbound
dom/base/nsFrameLoader.cpp
dom/base/nsFrameLoader.h
dom/ipc/ContentParent.cpp
modules/libpref/init/all.js