- nginx: merge function: default action is now to replace older locations in the nginx vhost configuration; a merge  instead of a replacement can be achieved by putting the string "##merge##" (without quotes) at the end of the most recent location line (e.g. "location ~ \.php$ { ##merge##").

php 5.4 fixes + bugfix interface/web/admin/list/remote_user.list.php ['table_idx'] from userid to remote_userid

Fixed: Notice: Undefined variable: maintenance_mode_error in /usr/local/ispconfig/interface/web/login/index.php on line 238

removed Forname and lastanme from sys_users list, added active and client_id -> grate to get relatons if you wanna deactivate a user

nowrap in list + fixes combobox + remove ugly round cornors + move additional css -> combobox looks more like ISPConfig

- Improved support for multiple PHP versions. Additional PHP versions have now their own form and database table.

join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use

fixed sorting from traffic, changed sessionvaribale because listDef[name] is by mail and web the same but different columes. Additional added table aliases in 'order by' by joins. Added table by log because server_id^C join server_id = sql error

Sort and limit in ispconfig all templates... additional info howtoforge - http://www.howtoforge.com/forums/showthread.php?p=274790

- nginx: changed default PHP-FPM values (pm_max_children, pm_start_servers, pm_min_spare_servers, pm_max_spare_servers).

- Added "actions" framework in server to replace the functions provided by the core modules
- Moved system update function from remoteactins core module to software update plugin.