Merge branch 'master' into 'master'

Marius Cramer

2014-02-11 e2b4f760bb91caf66445a888c7a185e972e97a3c

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