Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 28 Sep 2015 16:31:23 +0000 (18:31 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 28 Sep 2015 16:31:23 +0000 (18:31 +0200)

Trivial merge