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

[erinn at torproject.org]

commit 464b80fad38a60af145e3bd7e7718d737c0a7c6e
Merge: c9923c3 5e38cce
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Mar 15 23:54:08 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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