Merge branch 'master' into 'master'

Marius Cramer

2014-10-13 559b657f9fc6a5374de9b7b1caf20abd4e308d76

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