From: tobiasKaminsky Date: Fri, 21 Nov 2014 16:58:32 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into triggerMediaScan X-Git-Tag: oc-android-1.7.0_signed~90^2~18 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e9ba0ebbfae76d20f74f296259f694844504836f?hp=--cc Merge remote-tracking branch 'upstream/develop' into triggerMediaScan --- e9ba0ebbfae76d20f74f296259f694844504836f