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

commit 349f942f6fd4eafaefa5c28c3d8563126214317a Merge: f4fae2b a17203c Author: Erinn Clark <erinn@torproject.org> Date: Fri Jul 6 15:09:44 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)