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

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