]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'backport_ldap_configurable_username_n_uuid' into stable5
authorArthur Schiwon <blizzz@owncloud.com>
Sat, 25 May 2013 12:07:38 +0000 (14:07 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Sat, 25 May 2013 12:07:38 +0000 (14:07 +0200)

Trivial merge