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

[erinn at torproject.org]

commit 33a8fe28e62911af38917184206313d957b7e804
Merge: 34bbc64 762ad1d
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Mar 8 16:38:46 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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