[tor-commits] [torbutton/master] Merge branch 'bug9587'

[mikeperry at torproject.org]

commit 7120c21a39e24bb41e7eb49f1ed004e7bb65f607
Merge: 67aee46 38c513d
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Sep 30 13:49:32 2013 -0700

    Merge branch 'bug9587'

 src/chrome/content/aboutTor/aboutTor.xhtml |    1 +
 src/chrome/content/torbutton.js            |   15 +++++++++++++++
 src/chrome/skin/aboutTor.css               |   12 ++++++++++++
 3 files changed, 28 insertions(+)