]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into user-no-change-displayname
authorRobin Appelman <icewind@owncloud.com>
Thu, 19 Dec 2013 14:57:04 +0000 (15:57 +0100)
committerRobin Appelman <icewind@owncloud.com>
Thu, 19 Dec 2013 14:57:04 +0000 (15:57 +0100)

Trivial merge