From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 30 Sep 2013 11:49:50 +0000 (+0200)
Subject: Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices
X-Git-Tag: oc-android-1.4.6~9^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/01a4676beb60c24a0f7aeb85624200fee4b6b6a5?hp=01a4676beb60c24a0f7aeb85624200fee4b6b6a5

Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices
---