Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:43:48 +0000 (18:43 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:43:48 +0000 (18:43 +0200)

Trivial merge