Merge branch 'master' into 'master'

Marius Cramer

2014-06-12 d3be569127300fa335a659c3ea40c100763d5fa9

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