Merge m-c to b2g-inbound
commitcdc2142f502485d623ca48a630afaaa65503b55e
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 23 Oct 2015 09:54:28 +0000 (23 11:54 +0200)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 23 Oct 2015 09:54:28 +0000 (23 11:54 +0200)
tree58ad5fddf46191b5003317599b6c5220a32260f1
parenta277769c95ed893b294e0c25564741d77cc31323
parentb98d307f3e7316f421814d58dd498785b1cdd90d
Merge m-c to b2g-inbound