From: tobiasKaminsky Date: Fri, 21 Nov 2014 16:54:47 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into triggerMediaScan X-Git-Tag: oc-android-1.7.0_signed~90^2~19 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5d49850c2593b68523051571925157939041f68d Merge remote-tracking branch 'upstream/develop' into triggerMediaScan --- 5d49850c2593b68523051571925157939041f68d