From: tobiasKaminsky Date: Fri, 2 Oct 2015 14:04:18 +0000 (+0200) Subject: Merge remote-tracking branch 'remotes/upstream/master' into sortAccents X-Git-Tag: oc-android-1.9^2~59^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7579d3daf7dd2135877b1029d0576fa2cb60aaaa?ds=inline Merge remote-tracking branch 'remotes/upstream/master' into sortAccents --- 7579d3daf7dd2135877b1029d0576fa2cb60aaaa