]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorBjoern Schiessle <schiessle@owncloud.com>
Tue, 26 Jun 2012 13:48:21 +0000 (15:48 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Tue, 26 Jun 2012 13:48:21 +0000 (15:48 +0200)

Trivial merge