Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Marius Cramer

2015-06-03 3f19613b5ebca832e8f341980278df5f8427c1ca

1
ALTER TABLE `web_domain` ADD `python` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `ruby`;