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

[erinn at torproject.org]

commit c0abd9af5a58992509d4e1116a1dd61a8f55b52b
Merge: 4f3bd9f 852f167
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu May 3 08:18:56 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/config/mozconfig-osx-i386   |    4 ++--
 build-scripts/config/mozconfig-osx-x86_64 |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)