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

[mikeperry at torproject.org]

commit ab48482bd24a4389a3db2438be807dc303ca2933
Merge: f0fe46b 8dff562
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Apr 21 15:28:28 2015 -0700

    Merge remote-tracking branch 'gk/bug_15757' into tor-browser-31.6.0esr-4.5-1

 browser/app/profile/000-tor-browser.js |    2 ++
 1 file changed, 2 insertions(+)