]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of github.com:owncloud/core
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 14 Jan 2013 09:33:17 +0000 (10:33 +0100)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 14 Jan 2013 09:33:17 +0000 (10:33 +0100)

Trivial merge