[tbb-commits] [tor-launcher/master] Merge branch 'bug13576-01'

[gk at torproject.org]

commit a37371ac9a866612e91a791251104184caad41ca
Merge: b48d563 78f505c
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Apr 15 20:01:36 2015 +0000

    Merge branch 'bug13576-01'

 src/chrome/content/network-settings-overlay.xul |    5 ++---
 src/chrome/content/network-settings.js          |   13 +++++--------
 src/chrome/skin/network-settings.css            |   10 ++++++++--
 3 files changed, 15 insertions(+), 13 deletions(-)