Merge branch 'master' into 'master'

Marius Cramer

2014-03-07 bed72531bfb1ca225bb2c009dfbacf8f09fcd128

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