]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of github.com:owncloud/core
authorBjoern Schiessle <schiessle@owncloud.com>
Wed, 23 Oct 2013 14:29:17 +0000 (16:29 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Wed, 23 Oct 2013 14:29:17 +0000 (16:29 +0200)

Trivial merge