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

[erinn at torproject.org]

commit 119fa1e679e2a9d69d16c97fa5ed6c3caeb11076
Merge: 316df4e d5b4b06
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Oct 16 11:22:31 2012 +0100

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/recommended-versions |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)