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

[mikeperry at torproject.org]

commit 48091657a58cabc3325741e25d75dc867b6143aa
Merge: ef2678c 5d1f5ea
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Dec 12 20:07:11 2013 -0800

    Merge branch 'maint-2.4'

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