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

[erinn at torproject.org]

commit edd91f582be790812320ab441097a44dad572585
Merge: 38a0675 24ed18b
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Apr 3 19:00:07 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 src/RelativeLink/RelativeLinkOSX.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)