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

[erinn at torproject.org]

commit 566fd4a74298d59eee2e367753b49c23074d10cd
Merge: c85e20f a190866
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Aug 6 02:21:54 2012 +0100

    Merge branch 'maint-2.3'

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