From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 6 Nov 2015 10:38:51 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c31f602fd19cac136032a3e02852f62be21aa489?ds=inline;hp=c31f602fd19cac136032a3e02852f62be21aa489

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

Conflicts:
	res/layout/list_item.xml
---