]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorRobin Appelman <icewind@owncloud.com>
Mon, 23 Jan 2012 23:24:09 +0000 (00:24 +0100)
committerRobin Appelman <icewind@owncloud.com>
Mon, 23 Jan 2012 23:24:09 +0000 (00:24 +0100)

Trivial merge