From: masensio <masensio@solidgear.es>
Date: Thu, 15 Oct 2015 14:17:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop'
X-Git-Tag: oc-android-1.9^2~50^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8e87cc2bf49407435ca55410577552e4ba6a92d0?ds=inline;hp=--cc

Merge remote-tracking branch 'origin/develop'
---

8e87cc2bf49407435ca55410577552e4ba6a92d0