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

[erinn at torproject.org]

commit c2be90ce4415e5253bce489e8efb35ec9d21602f
Merge: 0fb2298 c9742f2
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Sep 4 23:53:18 2011 +0100

    Merge branch 'bug2525' into maint-2.2

 src/RelativeLink/RelativeLink.sh |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)