Merge m-c to m-i

2013-10-12 15:27:11 -07:00 · 2013-10-12 15:27:11 -07:00 · 47445c3827
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@ -18,7 +18,7 @@ load 307979-1.html
 load 309322-1.html
 load 309322-2.html
 load 309322-3.html
-load 309322-4.html
+skip load 309322-4.html # Bug 859424
 load 310556-1.xhtml
 load 321224.xul
 load 322780-1.xul