Bugfix / Stephan Peitz and more paranoid error checking
Merge branch 'master' of github.com:moses-smt/mosesdecoder
Merge ../mosesdecoder into hieu