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

[erinn at torproject.org]

commit 14fe42ac63634ae7ed2358b6d6e751974d6c6fa6
Merge: d849559 d3b0d1b
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri May 11 21:03:01 2012 -0300

    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       |    9 +++++++++
 changelog.osx-2.2         |    9 +++++++++
 changelog.windows-2.2     |    9 +++++++++
 10 files changed, 37 insertions(+), 10 deletions(-)