Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

.classpath

@@ -33,7 +33,6 @@
 	<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/wstx-asl-3.2.7.jar"/>
 	<classpathentry kind="lib" path="lib/httpcore-4.2.3.jar" sourcepath="/Volumes/Raptor/Data/sourcecode/httpcore/src/main/java"/>
 	<classpathentry kind="lib" path="lib/httpclient-4.2.3.jar" sourcepath="/Volumes/Raptor/Data/sourcecode/httpclient/src/main/java"/>
 	<classpathentry kind="lib" path="lib/httpmime-4.2.3.jar"/>
@@ -68,6 +67,7 @@
 	<classpathentry kind="lib" path="lib/lucene-spatial-4.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/lucene-suggest-4.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/guava-13.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/wstx-asl-3.2.9.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>

addon/YaCy.app/Contents/Info.plist

@@ -94,7 +94,7 @@
 			<string>$JAVAROOT/lib/solr-solrj-4.1.0.jar</string>
 			<string>$JAVAROOT/lib/spatial4j-0.3.jar</string>
 			<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
-			<string>$JAVAROOT/lib/wstx-asl-3.2.7.jar</string>
+			<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>
 			<string>$JAVAROOT/lib/xercesImpl.jar</string>
 			<string>$JAVAROOT/lib/xml-apis.jar</string>
 			<string>$JAVAROOT/lib/yacycore.jar</string>

build.xml

@@ -214,7 +214,7 @@
         <pathelement location="${lib}/solr-solrj-4.1.0.jar" />
     	<pathelement location="${lib}/spatial4j-0.3.jar" />
     	<pathelement location="${lib}/webcat-0.1-swf.jar" />
-    	<pathelement location="${lib}/wstx-asl-3.2.7.jar" />
+    	<pathelement location="${lib}/wstx-asl-3.2.9.jar" />
     	<pathelement location="${lib}/xercesImpl.jar" />
     	<pathelement location="${lib}/xml-apis.jar" />
     	<pathelement location="${lib}/zookeeper-3.4.5.jar" />