From: jabarros <jabarros@solidgear.es>
Date: Mon, 19 Jan 2015 10:03:05 +0000 (+0100)
Subject: Merge branch 'develop' into delete_local_files
X-Git-Tag: oc-android-1.7.0_signed~17^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9b653a1d9d8ae2982e15b4f5117d1c8664152ccb?ds=inline;hp=--cc

Merge branch 'develop' into delete_local_files
---

9b653a1d9d8ae2982e15b4f5117d1c8664152ccb