From: Jorge Antonio Diaz-Benito Soriano Date: Sat, 29 Nov 2014 20:12:51 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into us4_view_text_files X-Git-Tag: oc-android-1.8~17^2~8^2~7 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d5566ce0a3c8ee8295f8c209a7d2a02f0f49faa2?ds=inline;hp=--cc Merge remote-tracking branch 'upstream/develop' into us4_view_text_files --- d5566ce0a3c8ee8295f8c209a7d2a02f0f49faa2