From: Andy Scherzinger Date: Tue, 15 Sep 2015 16:43:48 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~29 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6f5cb9aacabe0ecf078717b876ef743f1e8f5f74?hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 6f5cb9aacabe0ecf078717b876ef743f1e8f5f74