From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 4 Sep 2015 11:43:36 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~65
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4de7462140ced3df0926e40bf29960802482d111?hp=--cc

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

Conflicts:
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
---

4de7462140ced3df0926e40bf29960802482d111