extra debug
fix
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
update
debug
debug
Merge branch 'master' of github.com:moses-smt/mosesdecoder
Merge branch 'master' of github.com:moses-smt/mosesdecoder

Conflicts:
	moses/Hypothesis.cpp
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Merge branch 'master' of github.com:moses-smt/mosesdecoder
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Was not up to date anymore with current PhraseDictionaryTree() constructor, the parameterer nscores seems no longer required. Adapted Cython code and reran cython (newer version) to generate C++ version..
Was not up to date anymore with current PhraseDictionaryTree() constructor, the parameterer nscores seems no longer required. Adapted Cython code and reran cython (newer version) to generate C++ version..
Revert "debug"

This reverts commit 0216189b81036fd93ed3a34fc3abae5233462211.
Revert "debug"

This reverts commit 069b56dac5b86646959452cedc279aa5096acb60.
Revert "Revert "debug""

This reverts commit 925000f681351759a319a095b7daa2861c8b84c3.
Revert "Revert "Revert "debug"""

This reverts commit 794281ad9ec91e09c8c49ad05a3a9668fed06b64.
reverting my debug changes, clean with main repo now
Merge pull request #65 from proycon/master

python-contrib was not up to date anymore with current PhraseDictionaryTree() constructor: fixed and reran cython (newer version) to generate cpp