tree a09d151808e3d73671473d7b245810f8eec6c4f6
parent a91a823922f8c8818f061c99293a00645a8ab047
parent ae5ec80e146ace4d1e3b66b2e8181e2e255b1e20
author kaspersorensen <i.am.kasper.sorensen@gmail.com> 1469718906 -0700
committer kaspersorensen <i.am.kasper.sorensen@gmail.com> 1469718906 -0700

Merge branch 'master' into METAMODEL-1099-elasticsearch-factories