Merge remote-tracking branch 'ispc3master/master' into vhostalias

Dominik

2014-01-23 2d7d9eaa5acda62f1580bc09304ce85a7f7cea9f

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL DEFAULT '';