commit 38ddb33c40630f799efa9fb3af1d1a3754e9201f
author Eike Stepper <stepper@esc-net.de> Sat Apr 20 08:25:26 2013 +0200
committer Eike Stepper <stepper@esc-net.de> Sat Apr 20 08:25:26 2013 +0200
tree dacf35c9ec5bec6a9231acb5e6f61652ab318a39
parent cf6c29f8a8c059c6b8d9d8449700b5c807641c87
parent b0ce7501cb2566d97733dd7a07d73b5d72f72134

Merge branch 'master' into committers/estepper/merger-2

Conflicts:
	plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java
	plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java
	plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java
	plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/templates/EMFFragmentTemplate.xpt
	plugins/org.eclipse.emf.cdo.ui/plugin.properties
	plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
	plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java