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

[mikeperry at torproject.org]

commit ea745403012427f289a06b60f35efb7ed799ab6f
Merge: 7120c21 2167f0c
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Sep 30 20:26:52 2013 -0700

    Merge remote-tracking branch 'brade/bug9224'

 src/chrome/content/torbutton.js |   61 ++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 23 deletions(-)