gitlabFork/ISPConfig3.git - Solinfo Gitblit

Merge remote-tracking branch 'renky/master_fixes'

Marius Cramer

2014-04-10 7e886ae640ca6b38b332f139427d69ae50cca352

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, April 10, 2014 03:17 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, April 10, 2014 03:17 -0400
commit	7e886ae640ca6b38b332f139427d69ae50cca352
tree	86c3083fa07684ef0e68c04145676c28986910c4 tree \| zip \| gz
parent	58964a90d06f523f991a67bd1068e1f504d1f8a9 view \| diff 62c0e92c5e2740b63de4ea45094529d0ee3f46a0 view \| diff

Merge remote-tracking branch 'renky/master_fixes'

Conflicts:
	install/sql/incremental/upd_0073.sql

76 files modified

	interface/web/client/form/client.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/client_template.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/reseller.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ar_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ar_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ar_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/bg_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/bg_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/bg_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/br_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/br_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/br_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_client_template.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/de_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/de_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/de_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/el_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/el_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/el_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/es_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/es_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/es_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/fi_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/fi_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/fi_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/fr_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/fr_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/fr_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/hr_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/hr_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/hr_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/hu_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/hu_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/hu_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/id_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/id_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/id_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/it_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/it_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/it_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ja_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ja_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ja_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/nl_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/nl_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/nl_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/pl_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/pl_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/pl_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/pt_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/pt_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/pt_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ro_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ro_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ro_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ru_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ru_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/ru_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/se_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/se_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/se_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/sk_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/sk_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/sk_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/tr_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/tr_client_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/tr_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_edit_limits.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_template_edit_limits.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/reseller_edit_limits.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/form/web_vhost_domain.tform.php	91 ●●●●● diff \| view \| raw \| blame \| history