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

[erinn at torproject.org]

commit b3787e1232593242d89d7e62357a73fb052fa20c
Merge: dccbcc1 dd611d8
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri May 4 08:14:04 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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