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

[erinn at torproject.org]

commit 722cec35254511047fdc2e4bcb5f094446c6bd47
Merge: 6ae1b78 22c0f8e
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Jun 5 01:09:05 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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