Merge remote-tracking branch 'ispc3master/master'

Dominik

2014-01-27 7bc0bcdf33dba22dcae84bd1d3e65898b742a4bc

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