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

[erinn at torproject.org]

commit 70291a76b5bc7c18fc54d5a84c5f16a9001a877e
Merge: 1153944 67671f3
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Oct 11 11:13:01 2012 +0100

    Merge branch 'maint-2.2' into maint-2.3

 README.LINUX-2.2          |    2 +-
 README.OSX-2.2            |    2 +-
 README.WIN-2.2            |    2 +-
 build-scripts/versions.mk |    2 +-
 changelog.linux-2.2       |    4 ++--
 changelog.osx-2.2         |    4 ++--
 changelog.windows-2.2     |    4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)