Merge branch 'master' of https://github.com/owncloud/android into descendIntoFolder
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 29 Oct 2015 08:40:44 +0000 (09:40 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 29 Oct 2015 08:40:44 +0000 (09:40 +0100)

Trivial merge