Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:13:30 +0000 (16:13 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:13:30 +0000 (16:13 +0200)

Trivial merge