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

[mikeperry at torproject.org]

commit ea5bb0714128307ef18d49a07afcbf37f06e1f23
Merge: 4f94c3e 5e1f906
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Mon Apr 22 21:08:38 2013 -0700

    Merge branch 'maint-2.4'

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