From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 17 Sep 2015 13:38:59 +0000 (+0200)
Subject: Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into... 
X-Git-Tag: beta-20151202~3^2~40
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/eae9c4e4b0027615159f348c862e9de22c505859?hp=--cc

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

Conflicts:
	owncloud-android-library
	res/layout-land/account_setup.xml
---

eae9c4e4b0027615159f348c862e9de22c505859