From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 2 Nov 2015 13:17:31 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~51
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/37d67265bd60a76f350a9941d8f59cdd82d38603?ds=sidebyside;hp=37d67265bd60a76f350a9941d8f59cdd82d38603

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

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