tree af3a64b41058b473e3af22f38eae14ca63d06caa
parent 546f2c284575c1e0c6504be8342f799004717443
parent fe2501068bb022f3d6eb7743fa026a401a719edf
author Christian-B <brenninc@cs.man.ac.uk> 1400257119 +0100
committer Christian-B <brenninc@cs.man.ac.uk> 1400257119 +0100

Merge branch 'core' into digitalpreservation

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