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

[erinn at torproject.org]

commit 06352bd7c7bf2bd240ca423d6c700606f6fc3e96
Merge: 85b9503 a90ae13
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat May 12 10:43:43 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/linux.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)