merge b2g-inbound to mozilla-central a=merge
commitebb986dc79c8ef17600ab1051f183fc4e0671784
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 2 Nov 2015 10:48:55 +0000 (2 11:48 +0100)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 2 Nov 2015 10:48:55 +0000 (2 11:48 +0100)
treec48c8726a9f5903c7df5c23e91740943d9fb5921
parentdd60c5be0a224ad103624dfc82d78a84f7314e27
parente3197d0764f8587750a06714de9f94cccedac915
merge b2g-inbound to mozilla-central a=merge