From: David A. Velasco Date: Tue, 8 Apr 2014 10:31:44 +0000 (+0200) Subject: Merge branch 'develop' into fixing_travis X-Git-Tag: oc-android-1.7.0_signed~336^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/14f359da5f642fde67b673c1b834b1ef026a44f7 Merge branch 'develop' into fixing_travis --- 14f359da5f642fde67b673c1b834b1ef026a44f7