From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 29 Oct 2015 08:42:06 +0000 (+0100)
Subject: Merge branch 'descendIntoFolder' of https://github.com/owncloud/android into descendI... 
X-Git-Tag: beta-20151122~26^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a9de27f1fa821f17ee5c9eed298a13f0947d0e3a?hp=4704e947da86120b055e6bea0c397f3e0efcbea2

Merge branch 'descendIntoFolder' of https://github.com/owncloud/android into descendIntoFolder
---