From: masensio Date: Fri, 30 May 2014 07:30:05 +0000 (+0200) Subject: Merge branch 'master' into develop X-Git-Tag: oc-android-1.7.0_signed~299 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/17c9af3541892b2985bb951e90ca33c5cf77c7e2?ds=inline;hp=--cc Merge branch 'master' into develop --- 17c9af3541892b2985bb951e90ca33c5cf77c7e2