From: Georg Ehrke Date: Fri, 27 Apr 2012 12:22:12 +0000 (+0200) Subject: Merge branch 'master' into movable_apps_2 X-Git-Tag: v4.0.0beta~168^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0aaf6d16a54f697fc51e075a3308716c1bc95762;p=nextcloud-server.git Merge branch 'master' into movable_apps_2 --- 0aaf6d16a54f697fc51e075a3308716c1bc95762