From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 08:36:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta
X-Git-Tag: beta-20151122~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2c2a4321610402ffdf9d287db181c784463d0a56

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

2c2a4321610402ffdf9d287db181c784463d0a56