Merge branch 'master' of git@git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 19 Apr 2010 16:00:34 +0000 (18:00 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 19 Apr 2010 16:00:34 +0000 (18:00 +0200)
commit2995914448d2de04cc128ae7a87f66019133cf16
tree6b3500b22af40bdc9683c1bbd367a27be29d9347
parent82d9117a2f0b94cf99510a8e3662658266407aba
parent34b1e0c281236cc6e120bac654d70b49dbc2c39c
Merge branch 'master' of git@git.tuebingen.mpg.de:libdai

Conflicts:

ChangeLog
tests/testfast.out
ChangeLog
tests/testfast.out