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

[erinn at torproject.org]

commit ef87887955eef730a7e6a712a0a4430fccd476d3
Merge: b090e92 98ab7bf
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 12 22:20:23 2012 +0100

    Merge branch 'maint-2.3'

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