Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 14 Oct 2015 08:32:16 +0000 (10:32 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 14 Oct 2015 08:32:16 +0000 (10:32 +0200)

Trivial merge