[tor-commits] [torbutton/master] Merge remote-tracking branch 'gk/bug_10716_v2'

[mikeperry at torproject.org]

commit eac0d3eefa335b8648acf5ca785cc56224e3dd9e
Merge: beb9d71 ca82201
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Sep 29 18:44:23 2014 -0700

    Merge remote-tracking branch 'gk/bug_10716_v2'

 src/components/external-app-blocker.js |   31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)