Bug 816793: Include 32-bit mozconfig for linux desktop b2g builds. r=ted
Bug 816793: Backed out changeset e77346fbdff1 for bustage. r=bustage
Merge birch to m-c
Merge m-i to m-c
Merge m-c to m-i