Merge branch 'master' into maven-runtime-split Conflicts: org.jboss.netty/netty-3.2.4.Final.jar
This is the m2eclipse-core repository