From: David A. Velasco Date: Sat, 17 Aug 2013 08:24:29 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/develop' into develop X-Git-Tag: oc-android-1.4.6~21 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e6b27a24c23bb3203df1ee4001fde146eab67298?ds=inline;hp=--cc Merge remote-tracking branch 'origin/develop' into develop --- e6b27a24c23bb3203df1ee4001fde146eab67298