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

Trivial merge