Merge branch 'origin/2.1.x'

unknown

2014-08-05 753a44a02b1eff487578644add2d513e0f7cc294

 xdgnjobs/ximple-jobcarrier/pom.xml

@@ -315,7 +315,7 @@
        <groupId>com.ximple.eofms.maven</groupId>
        <artifactId>ximple-jar-collector</artifactId>
        <!--version>${project.version}</version-->
          <version>2.1.1</version>
          <version>2.1.2</version>
        <executions>
          <execution>
            <goals>