From: jabarros <jabarros@solidgear.es>
Date: Mon, 17 Nov 2014 12:49:17 +0000 (+0100)
Subject: Merge branch 'develop' into nea_upload_files
X-Git-Tag: oc-android-1.7.0_signed~101^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a7c4814e282520936a6e22055e66ac05438689dc?ds=inline;hp=a7c4814e282520936a6e22055e66ac05438689dc

Merge branch 'develop' into nea_upload_files
---