tree bd948933ca9b983128fb3320eb92836df9d2b3fc
parent 1c69198822bb081d61c30841ee9267a424e29926
parent 5566215b46d5568e21de6d421e276dc300a812f2
author Stian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk> 1400507274 +0100
committer Stian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk> 1400507274 +0100

Merge branch 'core' into digitalpreservation

Conflicts:
	src/main/install4j/taverna-commandline.install4j