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

[erinn at torproject.org]

commit 0220d0a26fa8fc72924a98536325b570d6848172
Merge: 87a3b82 fd39bf0
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Aug 29 19:08:16 2012 +0100

    Merge branch 'maint-2.3'

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