Merge branch 'master' of github.com:roundcube/roundcubemail

Conflicts:
	program/lib/Roundcube/rcube_ldap.php
pull/5326/head
Aleksander Machniak 8 years ago
commit ded320a86a

Diff Content Not Available