Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-10-14 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816

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