Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 19 Oct 2015 11:00:15 +0000 (13:00 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 19 Oct 2015 11:00:15 +0000 (13:00 +0200)

Trivial merge