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

[erinn at torproject.org]

commit 0c4d7fc9d5dcb3d2e5c7053b4e4b0d8098a4f4e4
Merge: d4b7a1f 7945762
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Apr 27 13:34:56 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 README.LINUX-2.2          |   10 +++++-----
 README.OSX-2.2            |   10 +++++-----
 README.WIN-2.2            |   10 +++++-----
 build-scripts/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    6 +++---
 build-scripts/windows.mk  |    2 +-
 changelog.linux-2.2       |   16 ++++++++++++++++
 changelog.osx-2.2         |   19 +++++++++++++++++++
 changelog.windows-2.2     |   16 ++++++++++++++++
 10 files changed, 72 insertions(+), 21 deletions(-)