Merge branch 'master' into 'master'

Marius Cramer

2015-06-03 c3fab8f2cdf92d6b9d66202e3210cc01e5c53db5

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