From: Andy Scherzinger Date: Wed, 4 Nov 2015 09:11:39 +0000 (+0100) Subject: Merge branch 'beta' of https://github.com/owncloud/android into beta X-Git-Tag: beta-20151122~45 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/570130ece72b228899ab2e5a708b656dc615e94d?ds=sidebyside;hp=--cc Merge branch 'beta' of https://github.com/owncloud/android into beta --- 570130ece72b228899ab2e5a708b656dc615e94d