]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into user
authorRobin Appelman <icewind@owncloud.com>
Fri, 31 May 2013 14:35:51 +0000 (16:35 +0200)
committerRobin Appelman <icewind@owncloud.com>
Fri, 31 May 2013 14:35:51 +0000 (16:35 +0200)

Trivial merge