Merge branch 'hide_used_domains' into 'master'

Marius Cramer

2014-07-08 cbdc7acabd3c61c3e8da7a3b04421f0d061fc5fa

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