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

[erinn at torproject.org]

commit 5a0466da37ea5773a7605ff6440bf0f789fd4ee7
Merge: 6520144 31434ae
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Apr 30 17:51:37 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/osx.mk |    2 +-
 changelog.osx-2.2    |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)