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

[erinn at torproject.org]

commit 2c7028b792228c0b999b63f15eba58050a0df779
Merge: a8043f0 6948e41
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Jun 12 18:15:17 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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