From: Andy Scherzinger Date: Tue, 8 Sep 2015 11:50:02 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~33 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ed86a0560aeadbbd4289420f9de5654053c09f55?ds=inline;hp=-c Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- ed86a0560aeadbbd4289420f9de5654053c09f55