gitlabFork/ISPConfig3.git - Solinfo Gitblit

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2015-02-03 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, February 3, 2015 04:10 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, February 3, 2015 04:10 -0500
commit	9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf
tree	f399178082031b2546362de7b622f630fbc47ab3 tree \| zip \| gz
parent	60f2b476337dca4a0cea0c523778454dfe1c8cf8 view \| diff 3dc6299457c24e0081baae684f6992b5def630ef view \| diff

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Conflicts:
	install/sql/incremental/upd_dev_collection.sql

86 files modified

1 files added

	install/dist/lib/fedora.lib.php	15 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/opensuse.lib.php	13 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	16 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_dev_collection.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/debian_postfix.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/fedora_postfix.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/gentoo_postfix.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/mysql-virtual_policy_greylist.cf.master	5 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/opensuse_postfix.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/quota_lib.inc.php	63 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/remote.d/sites.inc.php	15 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/remote.conf.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/mail_alias.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/mail_forward.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/mail_user.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ar_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ar_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ar_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/bg_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/bg_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/bg_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/br_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/br_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/br_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/el_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/el_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/el_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fi_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fi_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fi_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ja_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ja_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ja_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pl_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pl_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pl_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pt_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pt_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pt_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ro_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ro_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ro_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_alias_edit.htm	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_forward_edit.htm	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_user_mailbox_edit.htm	8 ●●●●● diff \| view \| raw \| blame \| history