Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 7 Aug 2015 15:11:04 +0000 (17:11 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 7 Aug 2015 15:11:04 +0000 (17:11 +0200)

Trivial merge