[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

[mikeperry at torproject.org]

commit 6acfa0b9b6cb4a4ca678ee7a336d50675eb29085
Merge: 5dd6773 7b11ca0
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Mon Jul 1 11:28:57 2013 -0700

    Merge branch 'maint-2.4'

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