]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorRobin Appelman <icewind@owncloud.com>
Thu, 16 Feb 2012 08:42:30 +0000 (09:42 +0100)
committerRobin Appelman <icewind@owncloud.com>
Thu, 16 Feb 2012 08:42:30 +0000 (09:42 +0100)

Trivial merge