another merge
another merge

mozilla/mozilla-opennews,erikao/mozilla-opennews,ryanpitts/mozilla-opennews,sinker/mozilla-opennews,mozilla/mozilla-opennews,sinker/mozilla-opennews,erikao/mozilla-opennews,mozilla/mozilla-opennews,erikao/mozilla-opennews,sinker/mozilla-opennews,ryanpitts/mozilla-opennews,ryanpitts/mozilla-opennews