From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 16 Sep 2015 14:27:47 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~27
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/94bc0699ace6ada85bcd52eef72434fb75bd882f?hp=94bc0699ace6ada85bcd52eef72434fb75bd882f

Merge branch 'master' of https://github.com/owncloud/android into material_buttons
fixed realignment item badges
Conflicts:
	res/layout/list_item.xml
---