Merge remote-tracking branch 'florian030/master'

Marius Cramer

2013-10-21 b533b414a075013307447a3fb895b1625504d477

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