]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
authorBjoern Schiessle <schiessle@owncloud.com>
Wed, 20 Jun 2012 15:08:48 +0000 (17:08 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Wed, 20 Jun 2012 15:08:48 +0000 (17:08 +0200)

Trivial merge