From: David A. Velasco Date: Mon, 20 Jan 2014 08:24:44 +0000 (+0100) Subject: Merge branch 'develop' into oc_framework_cleanup_and_documentation X-Git-Tag: oc-android-1.5.5~69^2~13 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3f4e615d5edd2b43b45e1d5f8a491b916f2272a2?hp=--cc Merge branch 'develop' into oc_framework_cleanup_and_documentation --- 3f4e615d5edd2b43b45e1d5f8a491b916f2272a2