merge mozilla-inbound to mozilla-central a=merge
commitb98d307f3e7316f421814d58dd498785b1cdd90d
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 23 Oct 2015 09:33:41 +0000 (23 11:33 +0200)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 23 Oct 2015 09:33:41 +0000 (23 11:33 +0200)
treef8acaa10c04252002f1c9faa45306d1b86cf877c
parenta2298ccb67ab0bf08fb759f18518ef0e87a1ac32
parentb2aa4e334adf5aece4534cc9f77031db72a52754
merge mozilla-inbound to mozilla-central a=merge