]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
authorSam Tuke <samtuke@owncloud.com>
Tue, 22 May 2012 13:44:40 +0000 (14:44 +0100)
committerSam Tuke <samtuke@owncloud.com>
Tue, 22 May 2012 13:44:40 +0000 (14:44 +0100)

Trivial merge