merge fx-team to mozilla-central a=merge
commit15320b53332b41a8fc03979a8ce89896f7eea247
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 4 Nov 2015 10:57:59 +0000 (4 11:57 +0100)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 4 Nov 2015 10:57:59 +0000 (4 11:57 +0100)
tree5f5e758334eca57d833a2e299b2976a1b8e2e12b
parente68c800b0adb965fe2913076da12bf66dbacd7e2
parent9768c79d2053eedb1a15083bcad8eb80c808535a
merge fx-team to mozilla-central a=merge