some translations...
README.md conflict?
Merge branch 'master' of https://github.com/alec80/redmine_ldap_push

Conflicts:
	README.md