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

[erinn at torproject.org]

commit 2f4e9b59d6bfb36cdc6ca108b9b210c37dd0a67f
Merge: 92f6355 a364852
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Apr 26 13:50:26 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/osx.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)