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

[erinn at torproject.org]

commit b910e7fcee7ac175ce1cc2a2a9e627850862ee91
Merge: 70291a7 86fba5c
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Oct 11 13:11:41 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       |    2 +-
 changelog.osx-2.2         |    2 +-
 changelog.windows-2.2     |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)