Merge m-c to inbound.

2012-05-18 13:35:36 -04:00 · 2012-05-18 13:35:36 -04:00 · 81f2bec769
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@ -1,6 +1,6 @@
 {
    "talos.zip": {
-        "url": "http://build.mozilla.org/talos/zips/talos.7fd63f3ef011.zip",
+        "url": "http://build.mozilla.org/talos/zips/talos.2339d6217ae1.zip",
        "path": ""
    }
 }