From: Jorge Antonio Diaz-Benito Soriano Date: Mon, 17 Nov 2014 12:36:26 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency X-Git-Tag: oc-android-1.7.0_signed~94^2~9 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9bfacf23cbcdbcdd79157bef18006487e7b59c0c?ds=inline;hp=--cc Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency --- 9bfacf23cbcdbcdd79157bef18006487e7b59c0c