From: David A. Velasco Date: Tue, 6 Aug 2013 10:17:52 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/develop' into develop X-Git-Tag: oc-android-1.4.6~22 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1f02143d9997dcfa66f8b3f93378c3e1877cb498?ds=inline;hp=--cc Merge remote-tracking branch 'origin/develop' into develop --- 1f02143d9997dcfa66f8b3f93378c3e1877cb498