Fixed jabber-ldap script
Support for redirection when loading URL in existent dialog
Merge pull request #1254 from Zentyal/jag/redirect-in-dialog

Support for redirection when loading URL in existent dialog
Merge pull request #1214 from Zentyal/jag/jabber-ldap-script

 Fixed jabber-ldap script
Merge branch '3.2' into 3.4

Conflicts:
	main/core/ChangeLog
	main/jabber/ChangeLog