[tbb-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'brade/bug13016' into tor-browser-31.1.1esr-4.x-1

[mikeperry at torproject.org]

commit 8daaea30f4141b4c5b19ef5bcf362969542ee21f
Merge: f52b2a0 bbc88ab
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Oct 8 23:53:50 2014 -0700

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

 layout/style/nsComputedDOMStyle.cpp |    3 +++
 1 file changed, 3 insertions(+)