commit 0fdea13a3edb93509857fd41cb1f3727210432f1 Merge: c7a53ba 1ee67f4 Author: Erinn Clark erinn@torproject.org Date: Tue Jun 12 15:30:33 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)