]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorSam Tuke <sam@donttravelempty.com>
Fri, 11 May 2012 12:18:51 +0000 (13:18 +0100)
committerSam Tuke <sam@donttravelempty.com>
Fri, 11 May 2012 12:18:51 +0000 (13:18 +0100)

Trivial merge