From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 13 Nov 2015 16:41:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/descendIntoFolder' into beta
X-Git-Tag: beta-20151122~26
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/423b208d68690f482c735f16ad73f721506e7c8b?hp=423b208d68690f482c735f16ad73f721506e7c8b

Merge remote-tracking branch 'remotes/upstream/descendIntoFolder' into beta
---