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

[erinn at torproject.org]

commit 4bbf121d16d4e1e4a06211db32d2cb02e2313c8f
Merge: 0220d0a 196ebd2
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Sep 4 14:46:10 2012 +0100

    Merge branch 'maint-2.3'

 build-scripts/osx-alpha.mk |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)