Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-02-26 bdc27bfea618952447ef7facab838df5741f1ec3

1
2
3
-- --------------------------------------------------------
 
ALTER TABLE  `web_domain` ADD  `perl` enum('n','y') NOT NULL default 'n' AFTER  `python`;