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

[mikeperry at torproject.org]

commit 1f4bfd86f6d351be637b5ee0a8aa78bce22e2090
Merge: 0087524 fb8c3ea
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Jul 31 18:01:19 2012 -0700

    Merge branch 'maint-2.2'

 build-scripts/config/prefs.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)