From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 28 Oct 2013 13:31:05 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ae179c4686413e3ab441339214d8b531c6859a26?hp=a6807cb93e193c988da5de06e30a0edd792efc4d

Merge branch 'develop' into review_build_process
---

diff --git a/libs/commons-httpclient-3.1.jar b/libs/commons-httpclient-3.1.jar
deleted file mode 100755
index 7c59774a..00000000
Binary files a/libs/commons-httpclient-3.1.jar and /dev/null differ
diff --git a/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar b/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar
new file mode 100755
index 00000000..2dd374f9
Binary files /dev/null and b/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar differ
diff --git a/libs/jackrabbit-webdav-2.6.4.jar b/libs/jackrabbit-webdav-2.6.4.jar
deleted file mode 100755
index 9d6d6f12..00000000
Binary files a/libs/jackrabbit-webdav-2.6.4.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index bba3d333..a55a77a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
-            <version>2.6.4</version>
+            <version>2.5.2</version>
         </dependency>
 
     </dependencies>