Bug 928787 - Convert in-content preference style sheets to LF; r=jaws
Merge fx-team to Mozilla-Central
Merge mozilla-central to mozilla-inbound