pull latest merge from master

2011-10-24 14:38:54 -05:00 · 2011-10-24 14:38:54 -05:00 · e9ef517b38
parent fc497fe1e8 261bb4a71f
commit e9ef517b38
2 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -32,5 +32,5 @@ target/
 # vim
 .*.sw[a-p]

-# kdiff merge
+# merge tooling
 *.orig
--- a/pom.xml
+++ b/pom.xml
@ -187,7 +187,7 @@
        <plugin>
          <groupId>org.eclipse.jetty.toolchain</groupId>
          <artifactId>jetty-version-maven-plugin</artifactId>
-          <version>1.0.6</version>
+          <version>1.0.7</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>