Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 27 Oct 2015 13:00:52 +0000 (14:00 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 27 Oct 2015 13:00:52 +0000 (14:00 +0100)

Trivial merge