From: Andy Scherzinger Date: Fri, 16 Oct 2015 08:41:32 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~15 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/30720e98a53c5a664631635c8799762b377bb915?hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 30720e98a53c5a664631635c8799762b377bb915