From: masensio <masensio@solidgear.es>
Date: Wed, 28 Jan 2015 09:37:08 +0000 (+0100)
Subject: Merge branch 'develop' into delete_local_files
X-Git-Tag: oc-android-1.7.0_signed~17^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d19128e770443fac3e134e46dbb88a3b29070fd3?ds=inline;hp=--cc

Merge branch 'develop' into delete_local_files
---

d19128e770443fac3e134e46dbb88a3b29070fd3