Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-14 466f06a5845e57661092392055999cc0895af5f8

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