Merge branch 'feature/add_spdy_option' into 'master'

Falko Timme

2014-12-12 7c57f78468664a8a62b555798834b4cf5b5e9bef

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