From: Andy Scherzinger Date: Wed, 9 Sep 2015 09:42:11 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~32 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0234ca22ea2422f49cb453e8f3030a699cdd94bd Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 0234ca22ea2422f49cb453e8f3030a699cdd94bd