[tbb-commits] [torbutton/master] Merge remote-tracking branch 'isis/bug12684-additional-canvas-ui-strings_squashed'

[mikeperry at torproject.org]

commit d09b8425899cf838e0f0b86fffee248cf2be63b5
Merge: b6e98c0 b0d3f18
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Aug 19 20:46:15 2014 -0700

    Merge remote-tracking branch 'isis/bug12684-additional-canvas-ui-strings_squashed'

 src/chrome/locale/en/torbutton.properties |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)