commit 877c8de52623c195d9823065abb6acefa7189e8d Merge: fdc017b 2d7cc73 Author: Erinn Clark <erinn@torproject.org> Date: Fri Mar 16 02:17:58 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig | 3 +++ build-scripts/config/mozconfig-osx-i386 | 3 +++ build-scripts/config/mozconfig-osx-x86_64 | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-)