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

[erinn at torproject.org]

commit cb165cfa4968e9d07cd72c2b9192f1963b481fac
Merge: 708d300 7aceb88
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Mar 18 12:53:39 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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