Merge branch 'master' into 'master'

Marius Cramer

2014-02-05 1db3b186c334013817778cd0bfe8edae9c1a0ce3

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