Merge branch 'master' into 'master'

Marius Cramer

2015-01-14 66190e1134676f3addf703b0424761c21cad7c52

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