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

[erinn at torproject.org]

commit 38a0675ba1225cebe9274d7d2faf881209d6ac4a
Merge: bb7ecfb 7a82857
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Mar 19 14:31:26 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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