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

[erinn at torproject.org]

commit 4f3bd9f3d2a2a775f29a1a14a830faa73f216d92
Merge: 21d3ebc b4ced8a
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu May 3 07:53:25 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/config/prefs.js      |    4 ----
 build-scripts/install-mozbuild.bat |    4 ++++
 build-scripts/linux.mk             |    2 +-
 build-scripts/osx.mk               |    2 +-
 build-scripts/versions.mk          |    7 ++-----
 build-scripts/windows.mk           |    4 ++--
 6 files changed, 10 insertions(+), 13 deletions(-)