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

[erinn at torproject.org]

commit 6cabf03b3039040554bba11de5b96f733be8bcda
Merge: b3787e1 f4a85c4
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri May 4 18:58:31 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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