commit 4c5a59914a15fa0795575f1f0b9ebe957bc52c65 Merge: 1a6eb58 a5648c8 Author: Mike Perry mikeperry-git@torproject.org Date: Wed Apr 15 18:41:42 2015 -0700

Merge remote-tracking branch 'arthur/13875' into tor-browser-31.6.0esr-4.5-1

dom/base/nsGlobalWindow.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)