tree e7b9d5bc8b2c7816ad19b5cd04e2d1b90a7543b4
parent 49d5634a6c7dee9f2dcc7cb60e33934bd203b51f
parent 4b039655409ac0af30997fe0d293cf0ac0278264
author Stian Soiland-Reyes <stain@apache.org> 1473872921 +0100
committer Stian Soiland-Reyes <stain@apache.org> 1473872921 +0100

Merge branch 'patch-2' of https://github.com/matthiaskoenig/incubator-taverna-language

This closes #34.

Contributed by Matthias König