Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 4 Aug 2015 09:47:44 +0000 (11:47 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 4 Aug 2015 09:47:44 +0000 (11:47 +0200)

Trivial merge