From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 4 Nov 2015 09:11:27 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~46
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4d33ecf15e9a4fa22e1e49e563793704c7598a3f?hp=4d33ecf15e9a4fa22e1e49e563793704c7598a3f

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

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---