From: masensio <masensio@solidgear.es>
Date: Tue, 20 May 2014 10:16:16 +0000 (+0200)
Subject: Merge branch 'develop' into refactor_update_filelist_from_database
X-Git-Tag: oc-android-1.7.0_signed~309^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/57fe5e08fdaa73c48fc14f7fb6412a7398d89c70?ds=inline;hp=-c

Merge branch 'develop' into refactor_update_filelist_from_database
---

57fe5e08fdaa73c48fc14f7fb6412a7398d89c70