Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 22 Sep 2015 07:59:53 +0000 (09:59 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 22 Sep 2015 07:59:53 +0000 (09:59 +0200)

Trivial merge