Bug 751618 - Zone renaming part 7 (r=jonco)
Bug 751618 - Zone renaming part 8 (r=terrence)
Bug 751618 - Zone renaming part 9 (r=terrence)
Bug 751618 - Zone renaming comment fix (r=jonco)
Bug 834414 - Stop holding on to a content resolver in Tab, which leaks the Activity instance it is associated with. r=bnicholson
Bug 834414 - Free the local refs in GeckoThread's long-running run method to prevent leaks. r=cpeterson
Bug 834449 - Part 3: simplify cleanup of cached statements. r=gps
Bug 820602 - Remove change to decoder notification behavior that causes AWSY leak. r=joe
Backed out changeset eb2f0c1fffc2 (bug 820613) for xpcshell failures.

--HG--
extra : rebase_source : 7fff4cec5a4d7839cd3ede5cd0322631e11f9d38
Merge m-c to fx-team.
Merge mozilla-central into services-central
Bug 834936 - Temporarily load JSMs into fewer compartments; r=rnewman

We concatenate JSMs together so we use less compartments and therefore
less memory. This is intended to be a temporary hack until the overhead
of compartments is less.
Bug 810146: Add telemetry for addon manager startup times, unpacked add-ons and various changes detected at startup
merge from inbound
Merge mozilla-central into services-central
Bug 832440: Fix inconsistency on appUnitsPerDevPixels's signedness in gfxFont and its clients by converting all instances to be signed. r=jfkthame
merge from inbound
Bug 835435 - Social.jsm referenced using bad uri in socialchat.xml, r=gavin
bug 835456 - Update Breakpad to SVN r1106. r=upstream
Merge m-c to inbound.