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

[erinn at torproject.org]

commit 8894278f6c5a23f8be9e001d4330a47df9b2ac1e
Merge: 4128643 300c2ef
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Apr 24 17:42:04 2012 -0700

    Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2

 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)