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

[mikeperry at torproject.org]

commit 21c4952809bb3bc335589a7bac60f6aa621ec892
Merge: 7d13f90 b9496b6
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Nov 27 18:35:41 2013 -0800

    Merge remote-tracking branch 'brade/bug9454'

 src/chrome/content/torbutton.js |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)