Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 11 Oct 2015 10:30:05 +0000 (12:30 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 11 Oct 2015 10:30:05 +0000 (12:30 +0200)

Trivial merge