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

Trivial merge