Merge branch 'master' into 'master'

Marius Cramer

2015-01-08 513a1785121fe98ced58bb0713885926a1ee42a9

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