Commit 0c14ce58 authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Merge branch 'master' into release-0.2.0

Conflicts:
	biopet-framework/pom.xml
parents fe1d703a 187bae8b
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment