Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
authorAndyScherzinger <info@andy-scherzinger.de>
Sun, 26 Jul 2015 20:35:28 +0000 (22:35 +0200)
committerAndyScherzinger <info@andy-scherzinger.de>
Sun, 26 Jul 2015 20:35:28 +0000 (22:35 +0200)

Trivial merge