Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 9 Sep 2015 09:42:11 +0000 (11:42 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 9 Sep 2015 09:42:11 +0000 (11:42 +0200)

Trivial merge