tree ff10e61ecc0a4a4899bff9530b62cecf6970aede
parent a09ee1607b1a1f12a812c9c7d74458f967ae8703
parent fe2501068bb022f3d6eb7743fa026a401a719edf
author Christian-B <brenninc@cs.man.ac.uk> 1400254190 +0100
committer Christian-B <brenninc@cs.man.ac.uk> 1400254190 +0100

Merge branch 'core' into astronomy

Fixed Conflicts:
	pom.xml
	src/main/install4j/taverna-commandline.install4j