Merge branch 'master' into 'master'

Marius Cramer

2014-05-09 da837c29d8a7dc5f5422c8e21bb83971079297c3

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