commit 2cdcdb2535957a79a2e6577188e25c9f783d3634 Merge: bfdfccc c127300 Author: Mike Perry <mikeperry-git@torproject.org> Date: Thu Aug 6 14:37:02 2015 -0700 Merge remote-tracking branch 'brade/bug16715-01' into tor-browser-38.1.0esr-5.0-1 dom/canvas/CanvasUtils.cpp | 2 +- dom/events/Event.cpp | 2 +- dom/events/KeyboardEvent.cpp | 2 +- layout/style/nsComputedDOMStyle.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)