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

[mikeperry@xxxxxxxxxxxxxx]

commit 18952b7ec9c25f812f46cfbf8100026301ea366e
Merge: c038e2c 9d4a8b4
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Fri May 25 13:32:49 2012 -0700

    Merge branch 'maint-2.2' into maint-2.3

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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits