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

[erinn at torproject.org]

commit 624905f44243968f87c775a135a64f46dfa4eaf2
Merge: d19d2d6 752e9ea
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Jul 15 22:05:36 2012 +0200

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    6 +++---
 build-scripts/windows.mk  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)