[opengm] 220/386: Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit 266b8f7f7c873b10d7ce094b0d256ce828787790
Merge: 903cb5d cd40760
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Mon Jan 12 14:06:20 2015 +0100

    Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning

 .../learning/maximum-likelihood-learning.hxx       | 177 +++++++++++----------
 .../learning/test_maximum_likelihood_learner.cxx   |  10 +-
 2 files changed, 100 insertions(+), 87 deletions(-)

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