Merge branch 'master' of git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 20 Apr 2010 11:02:30 +0000 (13:02 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 20 Apr 2010 11:02:30 +0000 (13:02 +0200)
commit1fd8b531f2029f57bde39f6ec5ef37901dfc4217
tree337a22ff8a5369d2f7347bfe5f44bd41b9dd3d54
parenteb033329acbd2133d13c7bbd9f5a9ae28870f930
parent2995914448d2de04cc128ae7a87f66019133cf16
Merge branch 'master' of git.tuebingen.mpg.de:libdai

Conflicts:
ChangeLog
ChangeLog