]> source.dussan.org Git - nextcloud-server.git/commitdiff
merge master with resolved conflicts
authorArthur Schiwon <blizzz@owncloud.com>
Wed, 23 Oct 2013 10:01:45 +0000 (12:01 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Wed, 23 Oct 2013 10:01:45 +0000 (12:01 +0200)
1  2 
apps/user_ldap/lib/access.php

Simple merge