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

Trivial merge