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

[erinn at torproject.org]

commit 27f13b373d35e142b21fca27a8d96d5b5133d95c
Merge: b910e7f cb980b0
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Oct 12 11:33:13 2012 +0100

    Merge branch 'maint-2.2' into maint-2.3

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