commit f1f66dc5096188a60a96df7ee5e32d9a4b81dbe5 Merge: d3c069a 9467a9d Author: Georg Koppen gk@torproject.org Date: Sat Aug 8 09:23:16 2015 +0000

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

dom/events/KeyCodeConsensus.h | 37 +++++++++++++++++++------------------ dom/events/KeyboardEvent.cpp | 5 +++-- 2 files changed, 22 insertions(+), 20 deletions(-)