---

yaml
---
r: 40561
b: refs/heads/dist-snap
c: 65bd40e
h: refs/heads/master
i:
  40559: 017f1fb
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 9b95d511316ae7124046de61d19335fdfaa021cc
+refs/heads/dist-snap: 65bd40e300323f1e4806dd84834b8d71bb89c08c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/core.rc

@@ -144,7 +144,7 @@ pub mod send_map;
 
 // Concurrency
 pub mod comm;
-#[merge = "task/mod.rs"]
+#[path = "task/mod.rs"]
 pub mod task;
 pub mod pipes;