Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 13 Sep 2015 19:17:38 +0000 (21:17 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 13 Sep 2015 19:17:38 +0000 (21:17 +0200)

Trivial merge