Merge branch 'origin/2.1.x'

unknown

2014-08-05 753a44a02b1eff487578644add2d513e0f7cc294

 xdgnjobs/ximple-elmparser/pom.xml

@@ -16,7 +16,7 @@
  <url>http://maven.apache.org</url>

  <properties>
    <xdgnio.version>1.2.2</xdgnio.version>
    <xdgnio.version>2.1.2</xdgnio.version>
  </properties>

  <scm>