Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-08-13 f382f091aa97d10056b4c433aa55298fece010d4

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