[irstlm] 42/78: Merge branch 'master' into cd-correction-model

[Giulio Paci]

This is an automated email from the git hooks/post-receive script.

giuliopaci-guest pushed a commit to tag adaptiveLM.v0.10
in repository irstlm.

commit 0079adb8e04bcae11c7740d547c760808e07676e
Merge: bb9d3f5 e3d6cc8
Author: Nicola Bertoldi <bertoldi at fbk.eu>
Date:   Wed Nov 11 19:54:46 2015 +0100

    Merge branch 'master' into cd-correction-model

 Makefile.am        | 2 +-
 src/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/irstlm.git