Merge branch 'fix_initial_ip_select' into 'master'

Marius Cramer

2014-08-22 b4f3f515ba92d74006f1f44f5e97c6625cfd8f43

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