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

[erinn at torproject.org]

commit f4fae2b474aacc7d5eeb940ea37072fe4b44c3e8
Merge: 75d8523 57fd7ad
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Jul 6 15:07:44 2012 +0200

    Merge branch 'maint-2.2' into maint-2.3

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