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

Trivial merge