]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorBjoern Schiessle <schiessle@owncloud.com>
Mon, 4 Jun 2012 16:04:29 +0000 (18:04 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 4 Jun 2012 16:04:29 +0000 (18:04 +0200)

Trivial merge