From: Thomas Müller Date: Wed, 25 Sep 2013 15:43:25 +0000 (+0200) Subject: Merge branch 'master' into move-aborted-upload-detection-into-plugin-master X-Git-Tag: v6.0.0alpha2~122^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46e47be78272b76c6c569a8f1589d78828d72ec1;p=nextcloud-server.git Merge branch 'master' into move-aborted-upload-detection-into-plugin-master --- 46e47be78272b76c6c569a8f1589d78828d72ec1