]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorSam Tuke <sam@donttravelempty.com>
Thu, 26 Apr 2012 17:45:59 +0000 (18:45 +0100)
committerSam Tuke <sam@donttravelempty.com>
Thu, 26 Apr 2012 17:45:59 +0000 (18:45 +0100)

Trivial merge