commit f8897bbdeeeba6d7d93baf53960d4a09bf26b728 Merge: 18952b7 4e405e9 Author: Erinn Clark erinn@torproject.org Date: Mon May 28 15:40:16 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

build-scripts/windows.mk | 5 +---- src/current-patches/mozilla-build/start-msvc.patch | 13 ++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-)