merge fx-team to mozilla-central a=merge
commita2298ccb67ab0bf08fb759f18518ef0e87a1ac32
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 23 Oct 2015 09:27:13 +0000 (23 11:27 +0200)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 23 Oct 2015 09:27:13 +0000 (23 11:27 +0200)
tree0499a3a05d2220a2fa4b6b2e4f1a450fa09de745
parentf6e8b532c7d356f2d3e8ec249c7a8ed6c82d05ff
parent5da6b0277791daa56cd86253e86317a37f8e5f8b
merge fx-team to mozilla-central a=merge