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

[erinn at torproject.org]

commit 28198dc6d0485abc515153757eb57f6a8fd8ecbe
Merge: dacbd0a 27b2a2e
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Feb 8 14:15:45 2013 +0100

    Merge branch 'maint-2.3' into maint-2.4

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