Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 7 Oct 2015 17:03:23 +0000 (19:03 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 7 Oct 2015 17:03:23 +0000 (19:03 +0200)

Trivial merge