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

[erinn at torproject.org]

commit 61758f76cfaddb16cf24279ca9d033fddaa1399c
Merge: c0abd9a 13f0261
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu May 3 09:29:03 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/linux.mk   |    2 +-
 build-scripts/osx.mk     |    2 +-
 build-scripts/windows.mk |    2 +-
 changelog.linux-2.2      |   12 ++++++++++++
 changelog.osx-2.2        |   14 ++++++++++++++
 changelog.windows-2.2    |   12 ++++++++++++
 6 files changed, 41 insertions(+), 3 deletions(-)