Merge branch 'master' into release

jmcc0nn3ll · jmcc0nn3ll · commit c8a066e44eb7 · 2012-10-29T16:46:06.000-05:00
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>jetty-parent</artifactId>
     <groupId>org.eclipse.jetty</groupId>
@@ -241,5 +242,4 @@
       </releases>
     </pluginRepository>
   </pluginRepositories>
-  </profiles>
 </project>
