Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 19 Oct 2015 10:59:39 +0000 (12:59 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 19 Oct 2015 10:59:39 +0000 (12:59 +0200)

Trivial merge