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

[erinn at torproject.org]

commit f764ddd2ceb8dc99a10afb27eeec65dd7a2bab91
Merge: 18d1057 b88ec22
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Aug 27 07:29:04 2012 +0100

    Merge branch 'maint-2.2' into maint-2.3

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