[tor-commits] [torbrowser/master] Merge branch 'bug4093' into maint-2.2

[erinn at torproject.org]

commit 8140d34b1cfa2626f0a81002c45500326d2c95ed
Merge: 689b151 98c3b35
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Sep 29 15:42:18 2011 +0100

    Merge branch 'bug4093' into maint-2.2

 src/RelativeLink/RelativeLink.sh    |    4 +---
 src/RelativeLink/RelativeLinkOSX.sh |   23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)