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

[erinn at torproject.org]

commit fe9c51463e759d8f7b9e05a2dc527db9d3da7984
Merge: 0caa05d 9c82539
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri May 11 16:12:17 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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