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

Trivial merge