[tbb-commits] [tor-browser-bundle/master] Merge branch 'bug15747'

[mikeperry at torproject.org]

commit ee481a3b5c04136c4f1cc4aa4f0d3c2c7a219d5f
Merge: c5e0b0b 063f653
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Apr 21 15:08:46 2015 -0700

    Merge branch 'bug15747'

 RelativeLink/start-tor-browser         |  128 ++++++++++++++++++++++----------
 RelativeLink/start-tor-browser.desktop |   29 ++++----
 2 files changed, 103 insertions(+), 54 deletions(-)