Merge branch 'master' of https://github.com/owncloud/android into develop
authorAndyScherzinger <info@andy-scherzinger.de>
Sun, 26 Jul 2015 20:34:13 +0000 (22:34 +0200)
committerAndyScherzinger <info@andy-scherzinger.de>
Sun, 26 Jul 2015 20:34:13 +0000 (22:34 +0200)

Trivial merge