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

[erinn at torproject.org]

commit 87a3b8262c2de9b494a9475347d8bbe8090e47a7
Merge: 3356ab5 2c46dfe
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Aug 29 05:18:25 2012 +0100

    Merge branch 'maint-2.3'

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