Merged php-fpm-integration branch into nuxwin master branch
Merge remote-tracking branch 'upstream/master'
- Fixed #581: Task - Add support for MariaDB
- Fixed #595: Enhancement - Allow per item reconfiguration
- Fixed #599: Bug - Ubuntu auto-installer adapter is broken
- Fixed: APT packages manager must be configured before any package installation
- Fixed: All mysql secure installation tasks are no done by the i-MSCP installer
- Fixed: Allow usage of remote MySQL server
- Fixed: The diff package is not available for Ubuntu > 12.04 (replaced by diffutils)
- Fixed i-MSCP network daemon should start/stop MySQL server only if installed
- Removed no longer needed Ubuntu maintenance script
- Updated INSTALL files
- Updated README file (new i-MSCP domains)
- Small fixes
Merge branch 'upstream-master'
Convert awstats to an option of webstats
Integrated WEBSTATS_ADDON variable in imscp.conf
Updated CHANGELOG to reflect WEBSTATS_ADDON changes
At this stage piwik should not yet be a visible choice
Updated .pot and .po/.mo Files
Merge pull request #11 from i-MSCP/piwik_second_take

Convert awstats to an option of webstats, first step to make webstats Addon configurable
Merge branch 'upstream-master'
Fixed: Awstats addon is broken (causing i-MSCP update failure...)
Refactoring + improvements +  small fixes
Small fixes
Merge branch 'upstream-master'
Merge branch 'master' into fixes-20130324

Conflicts:
	configs/debian/apache/parts/domain.tpl
	configs/debian/apache/parts/domain_ssl.tpl
	docs/preseed.pl
	engine/PerlLib/Addons/awstats.pm
	engine/PerlLib/Addons/awstats/installer.pm
	engine/PerlLib/Modules/Domain.pm
	engine/PerlLib/Servers/httpd/apache_fcgi.pm
	engine/PerlLib/Servers/httpd/apache_itk.pm