Bug 970148 - Support for simple pairing record. r=alive
deleted closing style which was left behind
Merge pull request #18507 from svic/Bug_970148

Bug 970148 - Support for simple pairing record
Merge pull request #18956 from ckerschb/closingStyle

Bug 858787 - Followup to: Flip the pref to turn on the CSP 1.0 parser for Firefox OS. r=gwagner