Bug 883501 - Fix -Wreorder warning in xpcom/base/nsConsoleMessage.cpp. r=msucan
Bug 883729 - Fix -Wnull-conversion warnings in xpcom. r=bsmedberg
Back out changeset 1b201503737b (Bug 883729) for landing on wrong branch
Back out changeset bc4c43776396 (Bug 883501) for landing on wrong branch
merge m-c to fx-team