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

[erinn at torproject.org]

commit a91b9e0d46756381e8992e6cdccfa3b442c665ad
Merge: 2f4e9b5 b38e2b0
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Apr 26 19:18:58 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/config/mozconfig-osx-x86_64 |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)