From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 20 Nov 2015 17:51:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/bug_1251' into beta
X-Git-Tag: beta-20151122~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5780aca37f2c8d74058b57be6e7f7b3024c26132?ds=inline;hp=5780aca37f2c8d74058b57be6e7f7b3024c26132

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