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

[erinn at torproject.org]

commit 6e9b75b9eba85cce483183a44c86326a3287a2cc
Merge: 75b70e9 f58f378
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Apr 29 11:16:47 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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