Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:32:48 +0000 (12:32 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:32:48 +0000 (12:32 +0100)

Trivial merge