From: David A. Velasco Date: Wed, 11 Dec 2013 07:52:25 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2 X-Git-Tag: oc-android-1.5.5~106^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9fe8cadedd33029ac5da1bf4460f20fefa4fc8b0?ds=inline;hp=--cc Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2 --- 9fe8cadedd33029ac5da1bf4460f20fefa4fc8b0