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

[erinn at torproject.org]

commit ba98f8cfbeb957cea28d5ab16b0c4a0ea5940a2f
Merge: 5cc51cb eaf6322
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Mar 13 23:45:29 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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