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

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

96e02ff0912b3cd725c96bd5729748fb86a39867