From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 16 Sep 2015 15:38:17 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~41
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d78077de4da35f0104457c60675421c3f01ba396

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

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
---

d78077de4da35f0104457c60675421c3f01ba396