Merge branch 'develop' into 'install-strings'

.gitignore

install/dist/lib/fedora.lib.php

install/dist/lib/gentoo.lib.php

install/dist/lib/opensuse.lib.php

install/install.php

install/lib/installer_base.lib.php

install/lib/mysql.lib.php

install/sql/incremental/upd_0089.sql

install/sql/incremental/upd_dev_collection.sql

install/sql/ispconfig3.sql

install/tpl/apache_apps.vhost.master

install/tpl/apache_ispconfig.conf.master

install/tpl/apache_ispconfig.vhost.master

install/tpl/debian6_dovecot2.conf.master

install/tpl/debian_dovecot2.conf.master

install/tpl/debian_postfix.conf.master

install/tpl/fedora_dovecot2.conf.master

install/tpl/fedora_postfix.conf.master

install/tpl/gentoo_postfix.conf.master

install/tpl/mysql-virtual_alias_domains.cf.master