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

[mikeperry at torproject.org]

commit fe62dabc72f98e748dcbbb6ea06cb15dab2b4645
Merge: 266dd0d 899369e
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Jul 31 18:17:35 2012 -0700

    Merge branch 'maint-2.2' into maint-2.3

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