hpcc-systems/HPCC-Platform — pull request #2535 by jakesmith (2012-06-13 09:24:03+00:00)
Title: Fix gh-2533 - n-way merge fail

Missing dataLinkStart/dataLinkStop causing n-way merge activity to fail

Signed-off-by: Jake Smith