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

[erinn at torproject.org]

commit 015742f6fd8fa0144be748adbfbc532591a4dfdc
Merge: 0c4d7fc 4c8d568
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Apr 28 10:51:36 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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