Merge branch 'master' of git.tuebingen.mpg.de:libdai

author Joris Mooij <joris.mooij@tuebingen.mpg.de>

Mon, 12 Apr 2010 19:27:44 +0000 (21:27 +0200)

committer Joris Mooij <joris.mooij@tuebingen.mpg.de>

Mon, 12 Apr 2010 19:27:44 +0000 (21:27 +0200)
author Joris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 12 Apr 2010 19:27:44 +0000 (21:27 +0200)
committer Joris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 12 Apr 2010 19:27:44 +0000 (21:27 +0200)
diff --cc src/jtree.cpp
Simple merge
diff --cc src/treeep.cpp
Simple merge
author	Joris Mooij <joris.mooij@tuebingen.mpg.de>
	Mon, 12 Apr 2010 19:27:44 +0000 (21:27 +0200)
committer	Joris Mooij <joris.mooij@tuebingen.mpg.de>
	Mon, 12 Apr 2010 19:27:44 +0000 (21:27 +0200)
		1	2
src/jtree.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/treeep.cpp	patch \|	diff1 \|	diff2 \|	blob \| history