From: Thomas Müller Date: Wed, 21 Aug 2013 22:18:14 +0000 (+0200) Subject: Merge branch 'master' of github.com:owncloud/core X-Git-Tag: v6.0.0alpha2~282 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fbc23c4a01e8d900fb057393a6ffaba77ab35ddc;p=nextcloud-server.git Merge branch 'master' of github.com:owncloud/core --- fbc23c4a01e8d900fb057393a6ffaba77ab35ddc