Merge branch 'master' into 'master'

Marius Cramer

2014-11-06 a66bbd6cba18494f48190025b525f903ef3d384d

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