Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

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