Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 26 Oct 2015 12:56:35 +0000 (13:56 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 26 Oct 2015 12:56:35 +0000 (13:56 +0100)

Trivial merge