Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 3 Aug 2015 19:38:32 +0000 (21:38 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 3 Aug 2015 19:38:32 +0000 (21:38 +0200)

Trivial merge