merge b2g-inbound to mozilla-central a=merge
commit19587912ba8f29f34afc766bbb4efc5f25d6306c
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 26 Oct 2015 09:54:17 +0000 (26 10:54 +0100)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 26 Oct 2015 09:54:17 +0000 (26 10:54 +0100)
tree6ddcddd2bd133135805dd9a0998b2636c523c54e
parent855d7ddb377c7fe4c5755bf8be9d8b5a1e7487c7
parent8d4f465259e757e7fb4c3b244917c98948e81193
merge b2g-inbound to mozilla-central a=merge