From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 4 Nov 2015 09:06:45 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0e9ddf44e12cf70d4556c8cc1c3e9abbed8a5d55?hp=0e9ddf44e12cf70d4556c8cc1c3e9abbed8a5d55

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