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

[erinn at torproject.org]

commit 802e620cdc78a16cfb68c2ae43e56e87254d83fb
Merge: 71ff1a2 54d74d5
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Apr 5 00:56:49 2013 -0400

    Merge branch 'maint-2.4'

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