From: Jorge Antonio Diaz-Benito Soriano Date: Fri, 21 Nov 2014 14:31:14 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency X-Git-Tag: oc-android-1.7.0_signed~94^2~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c63f7fbfafbc7cd1b984e73274f87671d719cab2?ds=inline Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency --- c63f7fbfafbc7cd1b984e73274f87671d719cab2