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

[erinn at torproject.org]

commit 55d73defda11bf1496e50565dd8ee911cb0530bb
Merge: 27f13b3 5b6d240
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Oct 13 10:20:42 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/linux.mk   |    2 +-
 build-scripts/osx.mk     |    2 +-
 build-scripts/windows.mk |    2 +-
 changelog.linux-2.2      |    6 ++++++
 changelog.osx-2.2        |    6 ++++++
 changelog.windows-2.2    |    6 ++++++
 9 files changed, 24 insertions(+), 6 deletions(-)