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

[erinn at torproject.org]

commit b05e24326c4ec9826231cfafdce314e5659149c5
Merge: 1f4bfd8 fe62dab
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Jul 31 18:17:43 2012 -0700

    Merge branch 'maint-2.3'

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