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

Sat Oct 27 11:20:48 UTC 2012

commit 0982a5210a22afc4ea26747aac86a61ba1c9951d
Merge: 0179e89 c6ecaa9
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Oct 27 12:03:20 2012 +0100

    Merge branch 'maint-2.2' into maint-2.3

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