Merge branch 'master' into 'master'

Marius Cramer

2015-02-26 7cbed050417f967f34340661b7d7a8a7e42e5710

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