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

[erinn at torproject.org]

commit 80c4a430b93a90b8e4dc397cbba7e789d9f94335
Merge: b53024f 90a083f
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Nov 17 01:02:10 2012 +0000

    Merge branch 'maint-2.2' into maint-2.3

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