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

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

ef80135674470b6159f94b0606548ef3aa10f994