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

[erinn at torproject.org]

commit e3d5bf421a65a08744b6ecad05ffab7272e59cfe
Merge: 643f11b e69b433
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Aug 8 15:21:20 2013 +0200

    Merge branch 'maint-2.4'

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