[tbb-commits] [tor-browser/tor-browser-38.1.0esr-5.x-1] Merge remote-tracking branch 'brade/bug16439-01' into tor-browser-38.1.0esr-5.x-1

[mikeperry at torproject.org]

commit 7989c2c5a56006e2ae1d4988ea8e9ce1e26057d6
Merge: c1baf26 b8fc9ed
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Jun 24 20:22:37 2015 -0700

    Merge remote-tracking branch 'brade/bug16439-01' into tor-browser-38.1.0esr-5.x-1

 browser/modules/moz.build |    6 +++++-
 toolkit/modules/moz.build |   10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)