From: gstraube <georg.straube@googlemail.com>
Date: Fri, 21 Aug 2015 18:45:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Tag: oc-android-1.8~35^2^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1a8a6557474d510bf0b49bc7f7d94bb4c96755a2

Merge remote-tracking branch 'upstream/develop' into develop
---

1a8a6557474d510bf0b49bc7f7d94bb4c96755a2