From: tobiasKaminsky Date: Fri, 21 Nov 2014 16:59:51 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into fileCount X-Git-Tag: oc-android-1.7.0_signed~91^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ae6b686775ea4a16a1d756bcacec393dcd76d1da?ds=inline;hp=--cc Merge remote-tracking branch 'upstream/develop' into fileCount --- ae6b686775ea4a16a1d756bcacec393dcd76d1da