]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
authorSam Tuke <samtuke@owncloud.com>
Wed, 16 May 2012 14:03:51 +0000 (15:03 +0100)
committerSam Tuke <samtuke@owncloud.com>
Wed, 16 May 2012 14:03:51 +0000 (15:03 +0100)

Trivial merge