From: Andy Scherzinger Date: Wed, 14 Oct 2015 08:33:49 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~16 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2610eb6805a834f9c5a938899c429355cd6791af Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 2610eb6805a834f9c5a938899c429355cd6791af