From: Andy Scherzinger Date: Wed, 7 Oct 2015 17:03:23 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~18 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/41a883549f9158ea7b3a6c36c33d1a290d9f7745?hp=-c Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 41a883549f9158ea7b3a6c36c33d1a290d9f7745