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

[mikeperry at torproject.org]

commit fd5b793ce1d1922411cf632bd0a53139e26efdc8
Merge: 3f80c17 3831da2
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Sep 29 17:25:27 2014 -0700

    Merge remote-tracking branch 'gk/bug_12947'

 src/components/tbSessionStore.js |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)