From: Andy Scherzinger Date: Fri, 30 Oct 2015 13:21:45 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow X-Git-Tag: beta-20151122~22^2~4^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/30e9622ae9b470c53343e68ec0651b962322f4af?hp=--cc Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow --- 30e9622ae9b470c53343e68ec0651b962322f4af