Merge branch 'master' into 'master'

Marius Cramer

2014-08-18 a9e6315be66a5cf3a743a1e1a7c8da4eb980e97c

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