...
Merge branch 'master' of https://github.com/kikinovak/slackware

Conflicts:
	Linux-HOWTOs/LDAP-HOWTO.txt