Merge branch 'master' of https://github.com/membrane/soa-model · membrane/soa-model@caddf08 · GitHub

Commit

Merge branch 'master' of https://github.com/membrane/soa-model

Browse files

Conflicts:
	core/pom.xml
	distribution/pom.xml

Loading branch information

keshavarzi committed Jun 13, 2013

2 parents 7a4054b + 64ddfa8 commit caddf08