Merge branch 'master' into logical_experimentation
tree: b616f6bf29986da463d3ca5335b3359f55d4fe09
  1. org.eclipse.emf.compare-parent/
  2. packaging/
  3. plugins/
  4. .gitignore