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

[erinn at torproject.org]

commit b2e32f48ed60e38c64c8f65d1a3e8b3ad7fd08a3
Merge: cd8ddac d986c08
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Dec 10 16:07:05 2012 +0000

    Merge branch 'maint-2.3' into maint-2.4

 build-scripts/linux.mk   |    4 ++--
 build-scripts/osx.mk     |    4 ++--
 build-scripts/windows.mk |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)