commit b7492fcf47a4cd4848f71552c768bb30eedef403 Merge: c0f17c1 7aeb874 Author: Sebastian Hahn sebastian@torproject.org Date: Fri May 25 14:10:13 2012 +0200

Merge branch 'maint-2.2' into maint-2.3

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