Bug 1009042 - add example.net to server-locations.txt; r=jmaher
Bug 995943 - Clean up some silly stuff surrounding prefs in CAPS. r=bz
Bug 995943 - Allow access to file:// URIs from pref-whitelisted sites. r=bz a=lsblakk