30 Apr
2012
30 Apr
'12
6:19 p.m.
commit 65201446b38f4aa5e0a403333d1ff86c67ad0bed Merge: 6e9b75b 1b56e94 Author: Erinn Clark erinn@torproject.org Date: Mon Apr 30 15:19:37 2012 -0300
Merge branch 'maint-2.2' into maint-2.3
build-scripts/config/mozconfig-osx-i386 | 7 +++++-- build-scripts/config/mozconfig-osx-x86_64 | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-)