Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 09:39:54 +0000 (11:39 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 09:39:54 +0000 (11:39 +0200)

Trivial merge