Merge branch 'master' into 'master'

Marius Cramer

2014-10-29 871298f2b5dc76c4bdc8501464aeeeaa5a44677e

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