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