[tor-commits] [tor-browser/tor-browser-31.2.0esr-4.x-1] Merge remote-tracking branch 'brade/bug13091-02' into tor-browser-31.2.0esr-4.x-1

[mikeperry at torproject.org]

commit 5d1ed040472bfcfe66445fe44ae41e37e94c2eb1
Merge: 3dd8fa4 26735f8
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Sat Oct 25 01:01:10 2014 -0700

    Merge remote-tracking branch 'brade/bug13091-02' into tor-browser-31.2.0esr-4.x-1

 config/version.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)