Master

See merge request !203

- changed language import to use mb_substr

add mailfilter to resync

See merge request !202

Dash problem

Define bash as a parser, some systems can have "dash" as a "sh" that will end with errors.

/usr/local/ispconfig/server/cron_daily.sh

[: 10: root: unexpected operator

[: 10: root: unexpected operator

See merge request !201

Define bash as a parser, some systems can have "dash" as a "sh" that will end with errors.
# /usr/local/ispconfig/server/cron_daily.sh
[: 10: root: unexpected operator
[: 10: root: unexpected operator

- backported patches

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/classes/tform.inc.php
	interface/lib/config.inc.php
	interface/web/admin/server_config_edit.php
	interface/web/themes/blue/ispconfig_version
	interface/web/tools/import_plesk.php
	interface/web/tools/resync.php
	interface/web/vm/openvz_action.php

FS#3749 - Disable smtp checkbox in mailbox setting has no effect on courier servers

See merge request !199

FS#3900 - Invalid home dir for shell users. Changed description from -Dir- to -Base Dir- to refelect that /home/username is appaneded to this directory.

Master Fixes

See merge request !198

Stable 3.0.5 Fixes

See merge request !197

FS#1212 - IP Address in fetchmail - allow ipv4 or hostname for pop/imap-server

See merge request !196

Master

See merge request !195