Merge branch 'master' of
authorkaspersorensen <i.am.kasper.sorensen@gmail.com>
Tue, 26 Apr 2016 19:47:08 +0000 (12:47 -0700)
committerkaspersorensen <i.am.kasper.sorensen@gmail.com>
Tue, 26 Apr 2016 19:47:08 +0000 (12:47 -0700)
commit025d07f00cc54d63a7edf5cc41187a88b8ab3a81
treeac28cea056c6f970a63601e435182a248075bb62
parentcca0cba47b5457ac40797ac38b6520255d9c9e19
parentbf439b44d03e6cc6b78b95504cc429c48f1e023e
Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/metamodel.git

Conflicts:
CHANGES.md

Closes #96
CHANGES.md