[moses-smt/mosesdecoder] 37494d: fix phikoehn's merge conflict

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

  Branch: refs/heads/master
  Home:   https://github.com/moses-smt/mosesdecoder
  Commit: 37494dd673622a88f5445f3daaa638be45ca253f
      https://github.com/moses-smt/mosesdecoder/commit/37494dd673622a88f5445f3daaa638be45ca253f
  Author: Barry Haddow <bar...@gm...>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M scripts/ems/experiment.meta

  Log Message:
  -----------
  fix phikoehn's merge conflict