[Bug 914591] make sure sessions get re-inited after expiration [r=ranbena]
Bug 929840 - [Settings] Use CSS for fake select elements
bug 930469, malformed properties file.
Remove leftover merge conflict marker
Merge pull request #13016 from KevinGrandon/bug_929840_use_css_for_settings_select

Bug 929840 - [Settings] Use CSS for fake select elements r=evelyn,ivanovpavel
Merge pull request #13066 from Pike/bug-930469-malformed-properties

bug 930469, malformed properties file.
Merge pull request #12529 from EverythingMe/session-reinit

[Bug 914591] make sure sessions get re-inited after expiration [r=ranbena]
Bug 911947 - Handle out-of-order message reception r=julienw