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

[erinn at torproject.org]

commit b8574c221a6454f7e9cd0082155c09d55c2c200a
Merge: c6d006f e6f9b2d
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Apr 25 13:43:17 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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