Merge branch 'stable-3.0.5' into 'master'

Marius Cramer

2014-02-25 230339ed643ed504f42660ca0541f5af85c5a684

1
ALTER TABLE  `web_domain` ADD  `ipv6_address` VARCHAR( 255 ) default NULL AFTER  `ip_address`;