From: masensio Date: Wed, 26 Feb 2014 09:15:37 +0000 (+0100) Subject: Merge branch 'develop' into send_file_pr311_with_develop X-Git-Tag: oc-android-1.5.5~22^2~12 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/54d99ee9f6465f4bf67ad38052456843a34de7ed?ds=sidebyside;hp=--cc Merge branch 'develop' into send_file_pr311_with_develop --- 54d99ee9f6465f4bf67ad38052456843a34de7ed