[tbb-commits] [tor-browser/tor-browser-31.2.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_13558' into tor-browser-31.2.0esr-4.5-1

[mikeperry at torproject.org]

commit 2e442bddd4c3dc1701d630acd0abdb979433cbe9
Merge: d67c094 6f12ba3
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Nov 6 23:37:55 2014 -0800

    Merge remote-tracking branch 'gk/bug_13558' into tor-browser-31.2.0esr-4.5-1

 mfbt/Char16.h |   37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)