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

[erinn at torproject.org]

commit 0caa05d8ae7a4d1943d2bba37d4bc489851c0ecd
Merge: daad02b 8ce8d71
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri May 11 16:11:31 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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