From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 6 Aug 2015 15:23:02 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
X-Git-Tag: oc-android-1.8~42^2~27
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9d9efd1c1ded9c225c16be80f4b648018839f3ef?hp=9d9efd1c1ded9c225c16be80f4b648018839f3ef

Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

Conflicts:
	owncloud-android-library
---