From: jabarros <jabarros@solidgear.es>
Date: Tue, 18 Nov 2014 09:22:04 +0000 (+0100)
Subject: Merge branch 'develop' into nea_upload_files
X-Git-Tag: oc-android-1.7.0_signed~101^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3137438cd5f2b8cefb69cebaf668e64a42adebf1?ds=inline;hp=-c

Merge branch 'develop' into nea_upload_files
---

3137438cd5f2b8cefb69cebaf668e64a42adebf1