From: Jan-Christoph Borchardt Date: Wed, 14 Aug 2013 18:41:49 +0000 (+0200) Subject: Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview X-Git-Tag: v6.0.0alpha2~235^2~31 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=137d644963b07d6c35ae7bbec58717daf3e977b2;p=nextcloud-server.git Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview --- 137d644963b07d6c35ae7bbec58717daf3e977b2