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

[erinn at torproject.org]

commit 248881b6f1cbb801fdd54b1d702d1693d405fc04
Merge: bd99923 de216a9
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Jun 7 17:58:33 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/linux.mk |    9 ++++-----
 build-scripts/osx.mk   |    2 +-
 changelog.linux-2.2    |   12 +++++++++++-
 changelog.osx-2.2      |   12 +++++++++++-
 changelog.windows-2.2  |   12 +++++++++++-
 5 files changed, 38 insertions(+), 9 deletions(-)