From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 6 Nov 2015 10:54:28 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/080a8ab7af2bc48e3c5fa1334ae91d21073e26c2?hp=080a8ab7af2bc48e3c5fa1334ae91d21073e26c2

Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
---