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

commit 77262289bf4838ac8464724dc3a96c7c63dfc5ac Merge: 6cabf03 bd399fe Author: Erinn Clark <erinn@torproject.org> Date: Fri May 4 18:59:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)