From: David A. Velasco Date: Tue, 8 Oct 2013 09:28:57 +0000 (+0200) Subject: Merge branch 'develop' into release-1.4.6 X-Git-Tag: oc-android-1.4.6~6^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7d512002911ff7ed915995bf58b12e69783438bd?ds=inline;hp=--cc Merge branch 'develop' into release-1.4.6 --- 7d512002911ff7ed915995bf58b12e69783438bd