]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorSam Tuke <samtuke@owncloud.com>
Fri, 1 Jun 2012 18:00:28 +0000 (19:00 +0100)
committerSam Tuke <samtuke@owncloud.com>
Fri, 1 Jun 2012 18:00:28 +0000 (19:00 +0100)

Trivial merge