[moses-smt/mosesdecoder] 2b7725: support LM OOV feature in train-model.perl

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

  Branch: refs/heads/weight-new
  Home:   https://github.com/moses-smt/mosesdecoder
  Commit: 2b7725db3495e80f28a4c2df3a14162a46db06f4
      https://github.com/moses-smt/mosesdecoder/commit/2b7725db3495e80f28a4c2df3a14162a46db06f4
  Author: Ales Tamchyna <tam...@uf...>
  Date:   2013-02-01 (Fri, 01 Feb 2013)

  Changed paths:
    M scripts/training/train-model.perl

  Log Message:
  -----------
  support LM OOV feature in train-model.perl


  Commit: 4b370508536c8db14adf76c8a688aee122409411
      https://github.com/moses-smt/mosesdecoder/commit/4b370508536c8db14adf76c8a688aee122409411
  Author: Hieu Hoang <hi...@ho...>
  Date:   2013-02-01 (Fri, 01 Feb 2013)

  Changed paths:
    M scripts/training/train-model.perl

  Log Message:
  -----------
  resolved conflicts


Compare: https://github.com/moses-smt/mosesdecoder/compare/530e8596970f...4b370508536c