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

[erinn at torproject.org]

commit 19d3c1fbf8650887e99b6b5cbceb9365dafb8571
Merge: b954810 f9cf082
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Sep 14 21:27:14 2012 +0100

    Merge branch 'maint-2.2' into maint-2.3

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