]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of github.com:owncloud/core
authorBjörn Schießle <schiessle@owncloud.com>
Wed, 12 Jun 2013 08:31:39 +0000 (10:31 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Wed, 12 Jun 2013 08:31:39 +0000 (10:31 +0200)

Trivial merge