Bug 828161 - Firefox OS cannot start up due to an exception: "Webapps.jsm: non-relative URI passed to resolveFromOrigin". r=mounir
Merge mozilla-central to mozilla-inbound
Backout da88cd4bc6db & 696264e2414c (bug 569356) for intermittent, but frequent test_doc_busy.html timeouts
Bug 828099 - upload a new talos.zip to capture fixes for android and windows counters. r=Callek