commit 8422662a5b8771b6e93a02e4cb6895ff1d8a3126 Merge: 2d81730 0396e4f Author: Mike Perry mikeperry-git@torproject.org Date: Tue Jul 28 07:30:10 2015 -0700

Merge remote-tracking branch 'arthur/15646+2' into tor-browser-38.1.0esr-5.0-1

dom/events/KeyCodeConsensus.h | 9 +++++++-- dom/events/KeyboardEvent.cpp | 10 +++++++++- 2 files changed, 16 insertions(+), 3 deletions(-)