Bug 886138 - Make Geolocation work when geo.wifi.uri is a file:// URI. r=jdm
Bug 917479 - Starting a simulator changes host and port settings. r=ochameau
Bug 917422 - Update Do Not Track strings for Metro and add a Learn More link [r=rsilveira]
Bug 843019 - Add VariablesViewController#setSingleVariable. r=vp, r=msucan
Followup - increase the test timeout for several more tests for Bug 918029. r=bbondy
Merge m-c to fx-team
Bug 922329 - HelperApps.getAppsForUri does not check for empty results and throws r=wesj
Bug 848731 - Deleting nodes or container frames now resets the markup, highlighter, css views accordingly, r=paul
Merge latest green fx-team changeset and mozilla-central