release fix for conflict
Merge pull request #8 from varkoly/master

Include routines from routines.rb into Ldap.rb
Merge branch 'master' of github.com:yast/yast-ldap into fix_conflicts

Conflicts:
	package/yast2-ldap.changes
Merge pull request #9 from yast/fix_conflicts

release fix for conflict
add syconfig agent needed for ldap module
release
Merge pull request #10 from yast/add_agennnt

Add agennnt
Clean up Yast::Ldap module.
To modify /etc/openldap/ldap.conf is the job of this module
Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/Makefile.am
We do not need thes file any more.
Everything we need is saved in /etc/openldap/ldap.conf
Fix the make file
Increase version.