[tor-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug14631-01'

[mikeperry at torproject.org]

commit dc2fae0f80f156a2f0d80004b3a631687e4c7128
Merge: 4394ffb fd2be43
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Mar 17 21:01:02 2015 -0700

    Merge remote-tracking branch 'brade/bug14631-01'

 src/chrome/locale/en/torbutton.properties |    7 +++++++
 1 file changed, 7 insertions(+)