merge mozilla-inbound to mozilla-central a=merge
commit3e11f2fe348f60a523e1cad6617e708f74d54731
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 4 Nov 2015 10:59:46 +0000 (4 11:59 +0100)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 4 Nov 2015 10:59:46 +0000 (4 11:59 +0100)
treeb9a9b0d8885a62459e086ee59415e49061c29c02
parent15320b53332b41a8fc03979a8ce89896f7eea247
parent43e4c98e28385a2ed6dd08fab8f267fcb4d16c25
merge mozilla-inbound to mozilla-central a=merge
toolkit/mozapps/extensions/internal/XPIProvider.jsm