[moses-smt/mosesdecoder] 30e5b0: merge conflict

[GitHub <no...@gi...>]

  Branch: refs/heads/span-length
  Home:   https://github.com/moses-smt/mosesdecoder
  Commit: 30e5b0575b30d1fefa367b9f27d2030e757875c1
      https://github.com/moses-smt/mosesdecoder/commit/30e5b0575b30d1fefa367b9f27d2030e757875c1
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M scripts/generic/extract-parallel.perl

  Log Message:
  -----------
  merge conflict