commit 4424293819b0ae7b184b5e0703e2b4511d1b24f4 Merge: b269bb0 9906e7e Author: Mike Perry mikeperry-git@torproject.org Date: Mon Sep 22 20:12:12 2014 -0700

Merge remote-tracking branch 'brade/bug13049' into tor-browser-24.8.0esr-4.x-1

browser/base/content/aboutDialog.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)