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

Trivial merge