Merge branch 'develop' into release-1.4.6 oc-android-1.4.6
authormasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 08:33:26 +0000 (10:33 +0200)
committermasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 08:33:26 +0000 (10:33 +0200)
commit194a7360f88e309608b990e52674ca2f884e6d0a
tree7e4349af21644d5d49b4c2f91eef5d2cccac9bbd
parent2b5c5679386d09a6170af1b2e14e87e0d5c72fab
parent881727f0504f223e1b878ee1b4cb87c9f73f9546
Merge branch 'develop' into release-1.4.6
src/com/owncloud/android/files/services/FileUploader.java