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

[erinn at torproject.org]

commit daad02b97c1c6b783919294aa41835ee9af65aac
Merge: 7726228 18dd7c3
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri May 11 10:51:11 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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