Merge remote-tracking branch 'origin/master' into m2e-self-hosting

Conflicts:
	com.ning.async-http-client/pom.xml
	org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF
	org.eclipse.m2e.archetype.common/pom.xml
	org.eclipse.m2e.core.ui/pom.xml
	org.eclipse.m2e.core/pom.xml
	org.eclipse.m2e.discovery/pom.xml
	org.eclipse.m2e.editor.xml/pom.xml
	org.eclipse.m2e.editor/pom.xml
	org.eclipse.m2e.feature/pom.xml
	org.eclipse.m2e.integration.tests.common/pom.xml
	org.eclipse.m2e.jdt/pom.xml
	org.eclipse.m2e.launching/pom.xml
	org.eclipse.m2e.lifecyclemapping.defaults/pom.xml
	org.eclipse.m2e.logback.appender/pom.xml
	org.eclipse.m2e.logback.configuration/pom.xml
	org.eclipse.m2e.logback.feature/pom.xml
	org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF
	org.eclipse.m2e.maven.indexer/pom.xml
	org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
	org.eclipse.m2e.maven.runtime/pom.xml
	org.eclipse.m2e.model.edit/pom.xml
	org.eclipse.m2e.refactoring/pom.xml
	org.eclipse.m2e.scm/pom.xml
	org.eclipse.m2e.sdk.feature/pom.xml
	org.eclipse.m2e.site/pom.xml
	org.eclipse.m2e.tests.common/pom.xml
	org.eclipse.m2e.usagedata/pom.xml
	org.jboss.netty/pom.xml
	pom.xml
	target-platform/pom.xml

1 files changed, 1 insertions, 1 deletions

diff --git a/pom.xml b/pom.xml
index 032015ae..c75afec1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.m2e</groupId>
   <artifactId>m2e-core</artifactId>
-  <version>1.0.100-SNAPSHOT</version>
+  <version>1.0.200-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Maven Integration for Eclipse (parent)</name>