Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 6 Sep 2015 18:50:47 +0000 (20:50 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 6 Sep 2015 18:50:47 +0000 (20:50 +0200)

Trivial merge