git ignore ldap config file
Merge remote-tracking branch 'upstream/master'
Merge pull request #620 from solispauwels/master

git ignore ldap config file