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

[erinn at torproject.org]

commit 3aa9cc2078ac4c69e4b1fe03d64280768e92134e
Merge: ea5bb07 b9effec
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Apr 23 14:53:46 2013 -0400

    Merge branch 'maint-2.4'

 build-scripts/versions-alpha.mk |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)