[tor-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug16200-02'

commit d379c3e7992d18f5bab152c527f164b53b217ff6 Merge: d37746c 6996177 Author: Mike Perry <mikeperry-git@torproject.org> Date: Wed Jun 24 19:36:17 2015 -0700 Merge remote-tracking branch 'brade/bug16200-02' src/defaults/preferences/preferences.js | 13 ------------- 1 file changed, 13 deletions(-)