Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 10:46:48 +0000 (12:46 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 10:46:48 +0000 (12:46 +0200)

Trivial merge