Merge inbound to mozilla-central r=merge a=merge
commit3380e11f29cd833afb9eac849a61e0736eaf73de
authorMargareta Eliza Balazs <ebalazs@mozilla.com>
Wed, 27 Dec 2017 21:37:41 +0000 (27 23:37 +0200)
committerMargareta Eliza Balazs <ebalazs@mozilla.com>
Wed, 27 Dec 2017 21:37:41 +0000 (27 23:37 +0200)
treedc92b8c6cc0f3f0ae9253574c888f613a0ed5b53
parentfbf290c3552efdb6df300ea2506bf4e00312d2b0
parent110ff92145e6bdda0bee5530f363dc048e784975
Merge inbound to mozilla-central r=merge a=merge