From: Björn Schießle Date: Wed, 12 Jun 2013 08:31:39 +0000 (+0200) Subject: Merge branch 'master' of github.com:owncloud/core X-Git-Tag: v6.0.0alpha2~655 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=de5eed4fb0363855da47b93fa94ad03e13bd7159;p=nextcloud-server.git Merge branch 'master' of github.com:owncloud/core --- de5eed4fb0363855da47b93fa94ad03e13bd7159