From: David A. Velasco Date: Mon, 23 Jun 2014 06:49:06 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/develop' into develop X-Git-Tag: oc-android-1.7.0_signed~277 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bcfd1f63bd5cf20104a74685864f4de6bb573f25?ds=inline;hp=--cc Merge remote-tracking branch 'origin/develop' into develop --- bcfd1f63bd5cf20104a74685864f4de6bb573f25