Merge branch 'feature/missing_translation' into 'master'

Falko Timme

2014-12-17 b8cdf90fdb9b83d7fdc22de4c1d2cc6ceb3401c7

1
ALTER TABLE `web_domain` ADD COLUMN `enable_spdy` ENUM('y','n') NULL DEFAULT 'n' AFTER `proxy_directives`;